修改

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

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

src/main/resources/application-prod.yml

@@ -22,7 +22,7 @@ openfeign:
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8066}
+    url: ${JOINFEIGN_URL:localhost:8066}
 server:
   port: 8095
   tomcat:

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

@@ -517,7 +517,7 @@
  <!-- 根据运输订单id查找调入仓库 -->
   <select id="getInwardWarehouse" resultType="java.lang.String" parameterType="java.math.BigDecimal">
     SELECT
-          distinct RISW.INWARD_WAREHOUSE_NAME "inwardWarehouseName"
+          distinct RISW.INWARD_WAREHOUSE_NAME  "inwardWarehouseName"
     FROM
       OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID