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

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

@@ -540,8 +540,9 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+                                        String endTime,
+                                        Integer warehouseId) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime,warehouseId);
     }
 
     /**

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

@@ -570,7 +570,8 @@ public interface WMSFeign {
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
                                  @RequestParam String startTime,
-                                 @RequestParam String endTime);
+                                 @RequestParam String endTime,
+                                 @RequestParam Integer warehouseId);
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩