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

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

@@ -971,12 +971,14 @@ public class WMSController extends BaseRESTfulController {
     }
     //    查询所有的钢材物资规格型号信息
     @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

@@ -843,11 +843,13 @@ public interface WMSFeign {
                                             @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")