2.25

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

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

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

@@ -567,6 +567,7 @@ public interface WMSFeign {
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
+                                 @RequestParam Integer warehouseId,
                                  @RequestParam String startTime,
                                  @RequestParam String endTime);