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

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

@@ -520,9 +520,8 @@ public class WMSController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer warehouseId,
                                            String  value) {
-        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,value);
+        return wmsFeign.getInventoryClose(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,value);
     }
     //库存结转定时器
     @PostMapping("/addInventoryClose")
@@ -542,9 +541,9 @@ public class WMSController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String con,
                                         String startTime,
-                                        String endTime,
-                                        Integer warehouseId) {
-        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime,warehouseId);
+                                        String endTime
+                                      ) {
+        return wmsFeign.getSendReceive(mapValue ==null? new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
     }
 
     /**
@@ -962,19 +961,24 @@ public class WMSController extends BaseRESTfulController {
     }
 //    查询所有的钢材物资信息
     @PostMapping(value = "/getSteelMaterialList")
-    public Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                 @RequestParam(value = "pageSize") Integer pageSize,
-                                                 @RequestParam(value = "apiId") Integer apiId) {
-        return wmsFeign.getSteelMaterialList(pageNum,pageSize,apiId);
+    public Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  Integer warehouseId,
+                                                   String con) {
+        return wmsFeign.getSteelMaterialList(mapVal ==null? new HashMap<>():mapVal,pageNum,pageSize,apiId,warehouseId,con);
     }
     //    查询所有的钢材物资规格型号信息
     @PostMapping(value = "/getSteelMaterialModelList")
-    public Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
-                                                   @RequestParam(value = "pageSize") Integer pageSize,
-                                                   @RequestParam(value = "apiId") Integer apiId,
+    public Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                        @RequestParam(value = "pageNum") Integer pageNum,
+                                                        @RequestParam(value = "pageSize") Integer pageSize,
+                                                        @RequestParam(value = "apiId") Integer apiId,
                                                         @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                        @RequestParam(value = "status") Integer status) {
-        return wmsFeign.getSteelMaterialModelList(pageNum,pageSize,apiId,warehouseId,status);
+                                                        @RequestParam(value = "status") Integer status,
+                                                        @RequestParam(value = "con") String con) {
+        return wmsFeign.getSteelMaterialModelList(mapValue ==null? new HashMap<>():mapValue,pageNum,pageSize,apiId,warehouseId,status,con);
     }
 //    根据对应的入库实绩id修改入库状态为预留
     @PostMapping("/changeReserved")

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

@@ -555,7 +555,6 @@ public interface WMSFeign {
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
                                     @RequestParam Integer pageSize,
-                                    @RequestParam Integer warehouseId,
                                     @RequestParam String value);
 
     //库存结转定时器
@@ -572,8 +571,8 @@ public interface WMSFeign {
                                  @RequestParam Integer pageSize,
                                  @RequestParam String con,
                                  @RequestParam String startTime,
-                                 @RequestParam String endTime,
-                                 @RequestParam Integer warehouseId);
+                                 @RequestParam String endTime
+                                 );
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
@@ -836,15 +835,21 @@ public interface WMSFeign {
                                           @RequestParam(value = "pageSize") Integer pageSize,
                                           @RequestParam(value = "apiId") Integer apiId);
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
-    Map<String,Object> getSteelMaterialList(@RequestParam(value = "pageNum") Integer pageNum,
-                                          @RequestParam(value = "pageSize") Integer pageSize,
-                                          @RequestParam(value = "apiId") Integer apiId);
+    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer warehouseId,
+                                            @RequestParam String con);
+
     @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
-    Map<String,Object> getSteelMaterialModelList(@RequestParam(value = "pageNum") Integer pageNum,
-                                            @RequestParam(value = "pageSize") Integer pageSize,
-                                            @RequestParam(value = "apiId") Integer apiId,
+    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                @RequestParam(value = "pageNum") Integer pageNum,
+                                                @RequestParam(value = "pageSize") Integer pageSize,
+                                                @RequestParam(value = "apiId") Integer apiId,
                                                  @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                 @RequestParam(value = "status") Integer status);
+                                                 @RequestParam(value = "status") Integer status,
+                                                 @RequestParam(value = "con") String con);
 
 
     @PostMapping("/api/v1/wms/inboundResult/changeReserved")