Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -459,6 +459,7 @@ public class TMSController extends BaseRESTfulController {
 
     }
 
+
     @ApiOperation(value = "采购火运装货作业")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/purchaseTrainLoad")
@@ -478,7 +479,7 @@ public class TMSController extends BaseRESTfulController {
         for (Map<String, Object> item : list) {
             //校验行
             if(item.get("通知单号")==null || item.get("通知单号").equals("")
-                || item.get("车号")==null || item.get("车号").equals("")
+                    || item.get("车号")==null || item.get("车号").equals("")
                     || item.get("发站")==null || item.get("发站").equals("")
                     || item.get("到站")==null || item.get("到站").equals("")
                     || item.get("装车日期")==null || item.get("装车日期").equals("")){
@@ -1142,4 +1143,5 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> disposeHandling(@RequestBody Map<String,Object> map) {
         return tmsFeign.disposeHandling(map);
     }
+
 }

src/main/resources/application-prod.yml

@@ -26,27 +26,27 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8000}
+    url: ${AMSFEIGN_URL:172.16.90.202:80}
 #    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:172.16.90.202:80}
 #    url: ${TMSFEIGN_URL:localhost:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8000}
+    url: ${WMSFEIGN_URL:172.16.90.202:80}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8000}
+    url: ${RMSFEIGN_URL:172.16.90.202:80}
 #    url: ${RMSFEIGN_URL:localhost:8060}
   EmsFeign:
-    url: ${EMSFEIGN_URL:172.16.90.202:8000}
+    url: ${EMSFEIGN_URL:172.16.90.202:80}
   SSOFeign:
     url: ${SSOFEIGN_URL:172.16.90.202:80}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:80}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8000}
+    url: ${REPORTFEIGN_URL:172.16.90.202:80}
 #    url: ${REPORTFEIGN_URL:localhost:8055}
   DzFeign:
-    url: ${DZFEIGN_URL:172.16.90.202:8000}
+    url: ${DZFEIGN_URL:172.16.90.202:80}
 #    url: ${DZFEIGN_URL:localhost:8056}