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

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

@@ -773,6 +773,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,47 +832,64 @@ public class WMSController extends BaseRESTfulController {
         return wmsFeign.deleteGridMaterial(materialOnlyCode);
     }
 
-        @PostMapping(value = "/createRestackMakeResult")
-        public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
-                @RequestParam("beforeLevel") BigDecimal beforeLevel,
-                @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
-                @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
-                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
-                @RequestParam("resultRemark") String resultRemark,
-                @RequestBody(required = false) List < Map < String, Object >> mps){
-            return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
-        }
+    @PostMapping(value = "/createRestackMakeResult")
+    public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
+                                                        @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                                                        @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                                                        @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                                                        @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                        @RequestParam("resultRemark") String resultRemark,
+                                                        @RequestBody(required = false) List < Map < String, Object >> mps){
+        return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
+    }
 
-        //修改实时库存,针对倒垛
-        @PostMapping(value = "/updateWmspGridMaterialForRestack")
-        public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
-            return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
-        }
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/updateWmspGridMaterialForRestack")
+    public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
+        return wmsFeign.updateWmspGridMaterialForRestack(mapValue);
+    }
 
-        //修改实时库存,针对倒垛
-        @PostMapping(value = "/insertStockTaking")
-        public Map<String, Object> insertStockTaking (@RequestParam(value = "warehouseId") String warehouseId,
-                @RequestParam(value = "materialCode") String materialCode,
-                @RequestParam(value = "quantity") Integer quantity){
-            return wmsFeign.insertStockTaking(warehouseId, materialCode, quantity);
-        }
-        //修改实时库存,针对倒垛
-        @PostMapping(value = "/getStockTakingList")
-        public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
-                @RequestParam(value = "pageSize") Integer pageSize,
-                @RequestParam(value = "apiId") Integer apiId){
-            return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
-        }
-        //    根据倒垛单ID获得物资类型
-        @GetMapping(value = "getRestackMakeTypeResult")
-        public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
-                @RequestParam("context") String context){
-            return wmsFeign.getRestackMakeTypeResult(restackMake, context);
-        }
-        //    改变已经稽核的吊牌信息
-        @GetMapping(value = "changeRestackMakeResult")
-        public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
-            return wmsFeign.changeRestackMakeResult(restackMake);
 
-        }
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/getStockTakingList")
+    public Map<String, Object> getStockTakingList (@RequestParam(value = "pageNum") Integer pageNum,
+                                                   @RequestParam(value = "pageSize") Integer pageSize,
+                                                   @RequestParam(value = "apiId") Integer apiId){
+        return wmsFeign.getStockTakingList(pageNum, pageSize, apiId);
+    }
+    //    根据倒垛单ID获得物资类型
+    @GetMapping(value = "getRestackMakeTypeResult")
+    public Map<String, Object> getRestackMakeTypeResult (@RequestParam("restackMake") String restackMake,
+                                                         @RequestParam("context") String context){
+        return wmsFeign.getRestackMakeTypeResult(restackMake, context);
     }
+    //    改变已经稽核的吊牌信息
+    @GetMapping(value = "changeRestackMakeResult")
+    public int changeRestackMakeResult (@RequestParam("restackMake") String restackMake){
+        return wmsFeign.changeRestackMakeResult(restackMake);
+
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @GetMapping(value = "selectRestackByWarehouseIds")
+    public Map<String, Object> selectRestackByWarehouseIds(@RequestParam("warehouseid") String warehouseid) {
+        return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+    }
+
+    //修改实时库存,针对倒垛
+    @PostMapping(value = "/insertStockTaking")
+    public Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                                @RequestParam(value = "materialCode") String materialCode,
+                                                @RequestParam(value = "quantity") Integer quantity) {
+        return wmsFeign.insertStockTaking(warehouseId,materialCode,quantity);
+    }
+//    查询所有的钢材物资信息
+    @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);
+    }
+
+}
+

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

@@ -758,8 +758,12 @@ 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);
 
 }