xiua

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

@@ -949,8 +949,11 @@ public class WMSController extends BaseRESTfulController {
                                              @RequestParam(value = "materialCode") String materialCode,
                                              @RequestParam(value = "materialSpecification") String materialSpecification,
                                              @RequestParam(value = "materialModel") String materialModel,
-                                             @RequestParam(value = "quantity") Integer quantity) {
-        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+                                             @RequestParam(value = "quantity") Integer quantity,
+                                             @RequestParam String actuallyWeight,
+                                             @RequestParam String materialTheWeight,
+                                             @RequestParam(value = "remark") String remark) {
+        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity,actuallyWeight,materialTheWeight,remark);
     }
     //修改预留转入库作业,针对预留
     @PostMapping(value = "/insertInbounds")
@@ -1053,5 +1056,38 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> afterInwardOutbound(@RequestBody Map<String,Object> map){
         return wmsFeign.afterInwardOutbound(map);
     }
+
+    @ApiOperation("获取理重信息")
+    @PostMapping("getTheoreticalByInfo")
+    public Map<String,Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                                   @RequestParam String  materialCode,
+                                                   @RequestParam String materialSpecification,
+                                                   @RequestParam String materialModel,
+                                                   @RequestParam Integer status,
+                                                   @RequestParam Integer num){
+        return wmsFeign.getTheoreticalByInfo(warehouseId,materialCode,materialSpecification,materialModel,status,num);
+    }
+
+    @ApiOperation("获取上传金蝶信息")
+    @PostMapping("getInboundEasInfo")
+    public Map<String,Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer warehouseId,
+                                                String startTime,
+                                                String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getInboundEasInfo(mapValue,apiId,pageNum,pageSize,warehouseId,startTime,endTime);
+    }
+
+    @ApiOperation("撤销上传金蝶")
+    @PostMapping("reduceInboundEas")
+    public Map<String,Object> reduceInboundEas(Integer inboundEasId){
+        return wmsFeign.reduceInboundEas(inboundEasId);
+    }
+
 }
 

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

@@ -821,10 +821,13 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/insertReserved")
     Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
-                                         @RequestParam(value = "materialCode") String materialCode,
-                                         @RequestParam(value = "materialSpecification") String materialSpecification,
-                                         @RequestParam(value = "materialModel") String materialModel,
-                                         @RequestParam(value = "quantity") Integer quantity);
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity,
+                                      @RequestParam(value = "actuallyWeight") String actuallyWeight,
+                                      @RequestParam(value = "materialTheWeight") String materialTheWeight,
+                                      @RequestParam(value = "remark") String remark);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
     Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
@@ -892,4 +895,24 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/platformWarehouse/afterInwardOutbound")
     Map<String, Object> afterInwardOutbound(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getTheoreticalByInfo")
+    Map<String, Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                             @RequestParam String materialCode,
+                                             @RequestParam String materialSpecification,
+                                             @RequestParam String materialModel,
+                                             @RequestParam Integer status,
+                                             @RequestParam Integer num);
+
+    @PostMapping("/api/v1/wms/inboundEas/getInboundEasInfo")
+    Map<String, Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer warehouseId,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/inboundEas/reduceInboundEas")
+    Map<String, Object> reduceInboundEas(@RequestParam Integer inboundEasId);
+
 }

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8094}
+    url: ${WMSFEIGN_URL:172.16.33.166:8095}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign: