完善内转钢材到异地库

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

@@ -82,6 +82,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     private static final String judgeInwardFactory = "化工园区铁专线内转";
 
 
+
+
     /**
      * 用于远程调用运输订单新增
      *
@@ -581,9 +583,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
             throw new Exception("钢材订单不允许撤销!");
         }
-//        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
-//            throw new Exception("撤单失败");
-//        }
+        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
+            throw new Exception("撤单失败");
+        }
         //获取运输订单号
         String orderNumber = (String) mesMap.get("orderNumber");
         //撤销订单的同时删除计量数据

src/main/resources/application-prod.yml

@@ -18,9 +18,9 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign: