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

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

@@ -40,14 +40,15 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsInboundResultStatistics")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "445", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
@@ -67,9 +68,10 @@ public class WMSController extends BaseRESTfulController {
                                                    Integer apiId,
                                                    Integer pageNum,
                                                    Integer pageSize,
+                                                   Integer warehouseId,
                                                    String startTime,
                                                    String endTime) {
-        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,startTime,endTime);
+        return wmsFeign.getWmsInboundResults(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,warehouseId,startTime,endTime);
     }
     @PostMapping("getWmsReservedResult")
     @ApiOperation(value = "展示预留入库实绩信息")
@@ -409,7 +411,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize,
@@ -452,7 +454,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
                                              Integer pageNum,
                                              Integer pageSize) {
@@ -474,7 +476,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+    public RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize) {
@@ -486,7 +488,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -499,7 +501,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+    public RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
@@ -512,7 +514,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+    public RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
@@ -608,7 +610,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增入库实绩")
     @PostMapping("/insertInboundResult")
     @Transactional
-    public Map<String,Object> addInvoice(@RequestBody List<Map<String, Object>> mapList) {
+    public Map<String,Object> addInvoice(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         return wmsFeign.insertInboundResult(mapList);
     }
 
@@ -621,7 +623,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增退库实绩")
     @PostMapping("/insertReboundResult")
     @Transactional
-    public String addReboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addReboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -649,7 +651,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiOperation("新增倒库入库实绩")
     @PostMapping("/insertIvboundResult")
     @Transactional
-    public String addIvboundResult(@RequestBody List<Map<String, Object>> mapList) {
+    public String addIvboundResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
         /*
         获取入库物资件数
          */
@@ -753,7 +755,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "372", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getIvboundMakeResultList(Map<String, Object> mapValue,
+    public RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
                                                           Integer apiId,

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

@@ -34,6 +34,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);
 
@@ -53,6 +54,7 @@ public interface WMSFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam Integer pageNum,
                                             @RequestParam Integer pageSize,
+                                            @RequestParam Integer warehouseId,
                                             @RequestParam String startTime,
                                             @RequestParam String endTime);