新增判断异地库

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

@@ -25,6 +25,8 @@ public interface OmstrainOrderMapper extends IBaseMapper<OmstrainOrder, BigDecim
 
     String getInwardWarehouse(BigDecimal orderId);
 
+    String getOutOfWarehouse(BigDecimal orderId);
+
     List<BigDecimal> getTrainOrderIds(BigDecimal orderId);
 
 }

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

@@ -154,8 +154,9 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             List<Map<String,Object>> data =(List<Map<String, Object>>) RemoteMap.get("data");
             //根据汽运订单查找分属于哪个异地库。
             String inwardWarehouse = omstrainOrderMapper.getInwardWarehouse(orderId);
+            String outOfWarehouse =  omstrainOrderMapper.getOutOfWarehouse(orderId);
             if (inwardWarehouse!=null) {
-                if (inwardWarehouse.contains("重庆金田")) {
+                if (inwardWarehouse.contains("重庆金田") || "钢材重庆组".equals(outOfWarehouse)) {
                     for (Map<String,Object> jitianMap:data) {
                         Map<String, Object> orchardStorehouse = new HashMap<>();
                         List<Map<String, Object>> orchardStorehouseList = new ArrayList<>();
@@ -178,7 +179,7 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
                         //调用果园库接口
                         sendMesToGuoyuan(orchardStorehouse);
                     }
-                } else if (inwardWarehouse.contains("成都城嘉")) {
+                } else if (inwardWarehouse.contains("成都城嘉")  || "钢材成都组".equals(outOfWarehouse)) {
                     //调用城嘉库登录接口获取token
                     //调用城嘉库推送接口
                     String token = DagonloginChenJiaku();

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

@@ -528,6 +528,20 @@
       OO.ORDER_ID = #{orderId}
   </select>
 
+  <!-- 根据运输订单id查找调出仓库 -->
+  <select id="getOutOfWarehouse" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+    SELECT
+      distinct ASM.TRANSFER_OUT_OF_WAREHOUSE "outOfWarehouse"
+    FROM
+      OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join AMS_SALE_MATERIAL ASM  ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+    WHERE
+      OO.ORDER_ID = #{orderId}
+    FETCH NEXT 1 ROWS ONLY
+  </select>
+
 
 
   <select id="getMaterialList" resultType="java.util.Map" parameterType="java.util.Map">