Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -95,8 +95,10 @@ public class WMSController extends BaseRESTfulController {
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId,
-                                                     String  con) {
-        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
+                                                     Integer warehouseId,
+                                                     String startTime,
+                                                     String endTime) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
 
     @PostMapping("/wmspoutboundresults/insertWmspOutBoundResult")
@@ -144,9 +146,10 @@ public class WMSController extends BaseRESTfulController {
                                                       Integer pageNum,
                                                       Integer pageSize,
                                                       Integer apiId,
-                                                      Integer warehouseId,
+                                                      String warehouseId,
+                                                      String time,
                                                       String con) {
-        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,con);
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,warehouseId,time,con);
 
     }
 //    查询仓库中超过库龄预警的物资

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

@@ -89,7 +89,9 @@ public interface WMSFeign {
                                               @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,
                                               @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+                                              @RequestParam Integer warehouseId,
+                                              @RequestParam String  startTime,
+                                              @RequestParam String  endTime);
 
     /**
      * 新增出库实绩
@@ -152,7 +154,8 @@ public interface WMSFeign {
                                                @RequestParam Integer apiId,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer warehouseId,
+                                               @RequestParam String warehouseId,
+                                               @RequestParam String time,
                                                @RequestParam String con);
 
     /**

src/main/resources/application-dev.yml

@@ -34,6 +34,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign:
-    url: ${JOINFEIGGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server:
   port: 8019

src/main/resources/application-prod.yml

@@ -35,6 +35,6 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
-    url: ${JOINFEIGGN_URL:172.16.33.166:8066}
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
   port: 8080