Sfoglia il codice sorgente

修改盘库作业bug

胡半仙 3 anni fa
parent
commit
957b3b9977

+ 9 - 0
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -770,6 +770,8 @@ public class WMSController extends BaseRESTfulController {
     //新增入库实绩
     @PostMapping("/inboundResult/insertInboundResult")
     public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList){
+
+
         return wmsFeign.addInvoice(userName,groupId,personnelWorkshopid,mapList);
     }
     //抢单
@@ -830,6 +832,13 @@ public class WMSController extends BaseRESTfulController {
                                                  @RequestParam(value = "apiId") Integer apiId) {
         return wmsFeign.getStockTakingList(pageNum,pageSize,apiId);
     }
+//    查询所有的钢材物资信息
+    @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);
+    }
     //    根据倒垛单ID获得物资类型
     @GetMapping(value = "getRestackMakeTypeResult")
     public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,

+ 6 - 2
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -735,7 +735,11 @@ public interface WMSFeign {
                                          @RequestParam(value = "quantity") Integer quantity);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/getStockTakingList")
-    Map<String,Object> getStockTakingList(@RequestParam(value = "warehouseId") Integer pageNum,
-                                          @RequestParam(value = "materialCode") Integer pageSize,
+    Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
+                                          @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);
 }