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

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

@@ -1189,9 +1189,8 @@ public class AMScontroller{
                                                       Integer pageSize,
                                                       Integer apiId,
                                                       Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      String con) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId, con);
+                                                      @RequestParam String carrierSsoId) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1364,12 +1363,11 @@ public class AMScontroller{
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         Integer issueStatus,
-                                         String con){
+                                         Integer issueStatus){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
     }
 
     @PostMapping("getSaleOrderInfoes")

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

@@ -422,7 +422,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,
@@ -465,7 +465,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) {
@@ -487,7 +487,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) {
@@ -499,7 +499,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,
@@ -512,7 +512,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,
@@ -525,7 +525,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,
@@ -621,7 +621,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);
     }
 
@@ -634,7 +634,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) {
         /*
         获取入库物资件数
          */
@@ -662,7 +662,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) {
         /*
         获取入库物资件数
          */
@@ -766,7 +766,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,
@@ -981,7 +981,7 @@ public class WMSController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "446", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsOutboundResultStatistics(Map<String, Object> mapValue,
+    public RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,

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

@@ -1202,8 +1202,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      @RequestParam String con) ;
+                                                      @RequestParam String carrierSsoId) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
     Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1323,8 +1322,7 @@ public interface AmsFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam Integer issueStatus,
-                                 @RequestParam String con);
+                                 @RequestParam Integer issueStatus);
 
 
     @ApiOperation(value="查询未上报的销售订单信息")