xjdsa

src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -142,4 +142,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     List<Map<String, Object>> getOffSiteWarehouse(String orderNumber);
 
+    String getAddressPlace(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -272,6 +272,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+                //判断该订单是不是异地库
+                String addressPlace = tmstruckLeaveFactoryResultMapper.getAddressPlace(orderId);
+                if (addressPlace != null && addressPlace.contains("城嘉库")) {
+                    //如果是城嘉库调用城嘉库的方法
+                }
                 try {
                     //发送短信
                     Map<String,Object> messageMap = tmstruckLeaveFactoryResultMapper.getMessageMap(orderId);

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -3144,6 +3144,7 @@
         decode(ASM.DELETED,0,'关闭','审核') "entryStatus",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
         RC.CONSIGNEE_COMPANY_NAME "receiveName",
+        RC.CONSIGNEE_ID "receiveId",
         ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
         ASM.IS_POUND_SALE   "isPoundSale",
         ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
@@ -3157,6 +3158,7 @@
         OO.ORDER_LINE_SEQUENCE "lineSequence",
         ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
         RSR.SALER_NAME "saler",
+        RSR.SALER_ID "salerId",
         RSR.SALER_NAME "salerName",
         RM.MATERIAL_ID  "materialId",
         RM.MATERIAL_NAME  "materialName",
@@ -3168,9 +3170,9 @@
         OO.ORDER_NUMBER "orderNo",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+        RRA.ADDRESS_ID  "shipperAddressId",
         RRP.PLACE_ID "placeId",
         RRP.ADDRESS_DELIVERY_ADDRESS "place",
-        RRA.ADDRESS_ID "shipperAddressId",
         RRA.ADDRESS_PROVINCE "addressProvince",
         RRA.ADDRESS_PROVINCE "province",
         RRA.ADDRESS_DISTRICT "district",

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1405,6 +1405,7 @@
             RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
             TLFR.RESULT_OUT_GATE_TIME "outGateTime",
             ASO.sale_remark "saleRemark" ,
+            TWR.INSERT_UPDATE_REMARK  "wagonno",
             sysdate "sendTime",
             '汽运' "transportType",
             '四川省达州市通川区' "shipperAddress",
@@ -1443,4 +1444,12 @@
           AND TWR.RESULT_NET_WEIGHT IS NOT NULL
           AND oo.order_number = #{orderNumber}
     </select>
+    <select id="getAddressPlace" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+        SELECT RRP.ADDRESS_DELIVERY_ADDRESS FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>