2.28

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

@@ -961,10 +961,13 @@ 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")

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

@@ -835,9 +835,13 @@ 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,