完善倒垛作业和盘库作业

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

@@ -199,7 +199,21 @@ public class RMScontroller {
     ){
         return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
-
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier1")
+    public int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier1(multipartFile);
+    }
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier2")
+    public int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier2(multipartFile);
+    }
+    //    处理承运商照片
+    @PostMapping("/uploadCarrier3")
+    public int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile){
+        return rmsFeign.uploadCarrier3(multipartFile);
+    }
     //获取物资列表
     @ApiOperation(value="获取物资列表")
     @ApiImplicitParams({

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

@@ -816,10 +816,29 @@ public class WMSController extends BaseRESTfulController {
         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);
+    }
 }

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

@@ -103,6 +103,15 @@ public interface RmsFeign {
     //删除承运商
     @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier1")
+    int uploadCarrier1(@RequestParam("file") MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier2")
+    int uploadCarrier2(@RequestParam("file") MultipartFile multipartFile);
+    //    处理承运商照片
+    @PostMapping("api/v1/rms/rmscarrier/uploadCarrier3")
+    int uploadCarrier3(@RequestParam("file") MultipartFile multipartFile);
     //    更新承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
@@ -587,4 +596,6 @@ public interface RmsFeign {
     @ApiOperation(value="创建", notes="查询油品名称")
     @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
     Map<String, Object> oilNameSelect();
+
+
 }

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

@@ -723,8 +723,19 @@ public interface WMSFeign {
     @GetMapping(value = "/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
     Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,
                                                  @RequestParam("context")String context);
-
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/changeRestackMakeResult")
+    int changeRestackMakeResult(@RequestParam("restackMake") String restackMake);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/updateWmspGridMaterialForRestack")
     Map<String,Object> updateWmspGridMaterialForRestack(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/wms/wmspgridmaterials/insertStockTaking")
+    Map<String,Object> insertStockTaking(@RequestParam(value = "warehouseId") String warehouseId,
+                                         @RequestParam(value = "materialCode") String materialCode,
+                                         @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,
+                                          @RequestParam(value = "apiId") Integer apiId);
 }