修改零星物资

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

@@ -1621,7 +1621,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
-                break;
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

src/main/resources/bootstrap.yml

@@ -42,36 +42,26 @@ redis:
 
 #feign设置
 openfeign:
-<<<<<<< HEAD
   #正式环境
 
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:192.168.1.104:8088}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8079}
-#  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8055}
-    #测试环境
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.104:8088}
+  AmsFeign:
+    url: ${AMSFEIGN_URL:192.168.1.104:8079}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.166:8055}
 
+    #测试环境
 #  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
 #  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
 #  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8079}
+#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
 #  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8055}
-    #测试环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
-  TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
-  AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.166:8018}
+#    url: ${IMFEIGN_URL:172.16.33.166:8018}
 
 
 mybatis:
@@ -84,6 +74,6 @@ mybatis:
 
 server:
   #正式
-#  port: 8095
+   port: 8095
   #测试
-  port: 8016
+  #port: 8016