采购物流bug提交修改

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

@@ -507,11 +507,12 @@ public class TMSController extends BaseRESTfulController {
                                                               Integer pageNum,
                                                               Integer pageSize,
                                                               Integer apiId,
-                                                        String con) {
+                                                              String con,
+                                                              Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getAmsshipDeliveryAttroneyList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
     }
 
     @PostMapping("insertshipDeliveryAttorney")
@@ -559,11 +560,12 @@ public class TMSController extends BaseRESTfulController {
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String con) {
+                                                         String con,
+                                                         Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return tmsshipFeign.getshipDeliveryNoticeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,status);
     }
 
     @PostMapping("insertDeliveryNotice")

src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -601,7 +601,8 @@ public interface TmsshipFeign {
                                                  @RequestParam Integer pageNum,
                                                  @RequestParam Integer pageSize,
                                                  @RequestParam Integer apiId,
-                                                 @RequestParam String con);
+                                                 @RequestParam String con,
+                                                 @RequestParam Integer status);
 
     /**
      * 新增提货委托
@@ -662,7 +663,8 @@ public interface TmsshipFeign {
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
                                             @RequestParam Integer apiId,
-                                            @RequestParam String con);
+                                            @RequestParam String con,
+                                            @RequestParam Integer  status);
 
     /**
      * 新增放货通知

src/main/resources/bootstrap.yml

@@ -39,11 +39,11 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.161:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:localhost:8070}
+    url: ${WMSHFEIGN_URL:172.16.33.161:8070}
   WMSFeign:
     url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign: