wms修改

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

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,227 +29,261 @@ public class WMSController extends BaseRESTfulController {
     WMSFeign wmsFeign;
     @Autowired
     QMSFeign qmsFeign;
+
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
     })
-    public Map<String,Object> getWmsInboundResult( Map<String, Object> mapValue,
-                                             Integer apiId,
-                                             Integer pageNum,
-                                             Integer pageSize){
-        return wmsFeign.getWmsInboundResult(mapValue,apiId,pageNum,pageSize);
+    public Map<String, Object> getWmsInboundResult(Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.getWmsInboundResult(mapValue, apiId, pageNum, pageSize);
     }
+
     @PostMapping("getWmspOutboundResult")
     @ApiOperation(value = "展示出库实绩信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "152", required = false, dataType = "BigDecimal"),
     })
-    public Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId){
-        return wmsFeign.getWmspOutboundResult(apiId,pageNum,pageSize);
+    public Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
+        return wmsFeign.getWmspOutboundResult(map==null?new HashMap<>():map,apiId, pageNum, pageSize,con);
     }
+
     @PostMapping("/insertWmspOutBoundResult")
     @ApiOperation(value = "新增出单实绩并返回出库单详情")
-    public Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false)Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
+    public Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutBoundResult(mapval);
         return resTfulResult;
     }
+
     @PostMapping("/insertWmspOutboundScanResult")
-    public Map<String,Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
+    public Map<String, Object> insertWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.insertWmspOutboundScanResult(mapval);
         return resTfulResult;
     }
+
     @PostMapping("/updataResultStatus")
-    public Map<String,Object> updataResultStatus(@RequestParam Integer resultId){
-        Map<String,Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
+    public Map<String, Object> updataResultStatus(@RequestParam Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.updataResultStatus(resultId);
         return resTfulResult;
     }
+
     @PostMapping("/getRmsMaterial")
-    public Map<String,Object> getRmsMaterial(@RequestBody(required = false) Map<String,Object> mapval){
-        Map<String,Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
+    public Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.getRmsMaterial(mapval);
         return resTfulResult;
     }
-   //查询实时库存数据
-   @PostMapping("/selectGridMaterialList")
-   @ApiOperation(value = "展示实时库存数据")
-   @ApiImplicitParams({
-           @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
-   })
-   public Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer apiId) {
-       return wmsFeign.selectGridMaterialList(apiId, pageNum, pageSize);
-
-   }
-  //钢材异地库出库扫描
-  @PostMapping("/OutScanResultTag")
-  public Map<String,Object> OutScanResultTag(@RequestBody(required = false) Map<String,Object> mapval){
-      Map<String,Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
-      return resTfulResult;
-  }
-  //钢材异地库出库展示实绩
-  @PostMapping("/getWmsOffsiteLibaryOutboundList")
-  @ApiOperation(value = "展示实时库存数据")
-  @ApiImplicitParams({
-          @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
-  })
-  public Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                   Integer pageNum,
-                                                   Integer pageSize,
-                                                   Integer apiId) {
-      return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
-  }
- //展示钢材扫描入库实绩列表
- @ApiImplicitParams({
-         @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
- })
- @PostMapping("/getWmsOffsiteLibaryInboundList")
- public Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId) {
-     return wmsFeign.getWmsOffsiteLibaryOutboundList(apiId,pageNum,pageSize);
- }
-//钢材异地库扫描入库
-@PostMapping("/ScanResultTag")
-public Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String,Object> map){
-    Map<String,Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
-    return resTfulResult;
-}
-//展示在途库存数据
-@ApiImplicitParams({
-        @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
-})
-@PostMapping("/getWmspIntransitInventory")
-public Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                             Integer pageNum,
-                                                             Integer pageSize,
-                                                             Integer apiId) {
-        return wmsFeign.getWmspIntransitInventory(apiId,pageNum,pageSize);
-    }
-//新增倒库出库实绩
-@PostMapping("/insertOutBoundResult")
-public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Map<String,Object> map){
-        Map<String,Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+
+    //查询实时库存数据
+    @PostMapping("/selectGridMaterialList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "216", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      String con) {
+        return wmsFeign.selectGridMaterialList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize,con);
+
+    }
+
+    //钢材异地库出库扫描
+    @PostMapping("/OutScanResultTag")
+    public Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> mapval) {
+        Map<String, Object> resTfulResult = wmsFeign.OutScanResultTag(mapval);
         return resTfulResult;
     }
-  //新增倒库出库扫描实绩
-  @PostMapping("/AddWmspOutboundScanResult")
-  public Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String,Object> mapVal){
-    Map<String,Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
-    return resTfulResult;
-}
-   //通过下拉框筛选数据
+
+    //钢材异地库出库展示实绩
+    @PostMapping("/getWmsOffsiteLibaryOutboundList")
+    @ApiOperation(value = "展示实时库存数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "164", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               String con) {
+        return wmsFeign.getWmsOffsiteLibaryOutboundList(mapVal == null ? new HashMap<>() : mapVal, pageNum, pageSize, apiId, con);
+    }
+
+    //展示钢材扫描入库实绩列表
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "165", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmsOffsiteLibaryInboundList")
+    public Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con) {
+        return wmsFeign.getWmsOffsiteLibaryInboundList(map == null ? new HashMap<>() : map, pageNum, pageSize, apiId, con);
+    }
+
+    //钢材异地库扫描入库
+    @PostMapping("/ScanResultTag")
+    public Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOffsiteLibraryInbound(map);
+        return resTfulResult;
+    }
+
+    //展示在途库存数据
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getWmspIntransitInventory")
+    public Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId) {
+        return wmsFeign.getWmspIntransitInventory(apiId, pageNum, pageSize);
+    }
+
+    //新增倒库出库实绩
+    @PostMapping("/insertOutBoundResult")
+    public Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.insertOutBoundResult(map);
+        return resTfulResult;
+    }
+
+    //新增倒库出库扫描实绩
+    @PostMapping("/AddWmspOutboundScanResult")
+    public Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.AddWmspOutboundScanResult(mapVal);
+        return resTfulResult;
+    }
+
+    //通过下拉框筛选数据
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "153", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/getWmspRestackMakeResultList")
-    public Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           Integer warehouseid,
-                                                           Integer gradtionNumber,
-                                                           Integer stackingId) {
-        return wmsFeign.getWmspRestackMakeResultList(apiId,pageNum,pageSize,warehouseid,stackingId,gradtionNumber);
-    }
-
-  //删除倒垛单
- @PostMapping("/deleteByResultId/{resultId}")
- public Map<String,Object> deleteByResultId(@PathVariable Integer resultId){
-     Map<String,Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
-     return resTfulResult;
- }
-   //下发倒垛单
+    public Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer warehouseid,
+                                                            Integer gradtionNumber,
+                                                            Integer stackingId) {
+        return wmsFeign.getWmspRestackMakeResultList(apiId, pageNum, pageSize, warehouseid, stackingId, gradtionNumber);
+    }
+
+    //删除倒垛单
+    @PostMapping("/deleteByResultId/{resultId}")
+    public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //下发倒垛单
     @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId){
-        Map<String,Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
-  //下拉框获取层次
+
+    //下拉框获取层次
     @GetMapping("/selectGardationNumber")
-    public Map<String,Object> selectGardationNumber(Integer warehouseid, Integer stackingId){
-        Map<String,Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid,stackingId);
+    public Map<String, Object> selectGardationNumber(Integer warehouseid, Integer stackingId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectGardationNumber(warehouseid, stackingId);
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectWarehouse")
-    public Map<String,Object> selectWarehouse(){
-        Map<String,Object> resTfulResult = wmsFeign.selectWarehouse();
+    public Map<String, Object> selectWarehouse() {
+        Map<String, Object> resTfulResult = wmsFeign.selectWarehouse();
         return resTfulResult;
     }
+
     //下拉框获取仓库名称
     @GetMapping("/selectStackingId")
-    public Map<String,Object> selectStackingId(Integer warehouseid){
-        Map<String,Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
+    public Map<String, Object> selectStackingId(Integer warehouseid) {
+        Map<String, Object> resTfulResult = wmsFeign.selectStackingId(warehouseid);
         return resTfulResult;
     }
+
     //展示倒垛单
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/selectRestackList")
-    public Map<String,Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer apiId,
-                                                        Integer DistrubtionStatus) {
-        return wmsFeign.selectRestackList(apiId,pageNum,pageSize,DistrubtionStatus);
-    }
-  //修改倒垛单
-  @PostMapping("/addRestackMakeResult")
-  public Map<String,Object> editRestackMakeResult(@RequestBody(required = false) Map<String,Object> mapVal){
-      Map<String,Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
-      return resTfulResult;
-  }
-  //渲染倒垛后的仓库信息
-  @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
-  public Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId){
-      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-      return resTfulResult;
-  }
-  //渲染倒垛后的垛位信息
-  @PostMapping("/selectAfterstackingByResultId/{resultId}")
-  public Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId){
-      Map<String,Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
-      return resTfulResult;
-  }
-  //PDA展示倒垛单
-  @PostMapping("/selectRestackForPDA")
-  public Map<String,Object> selectRestackForPDA(@RequestBody(required = false) Map<String,Object> map){
-      Map<String,Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
-      return resTfulResult;
-  }
-  //PDA根据实绩id查找物资信息
-  @PostMapping("/selectMaterialInfoByResultId")
-  public Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String,Object> map){
-        Map<String,Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+    public Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList(apiId, pageNum, pageSize, DistrubtionStatus);
+    }
+
+    //修改倒垛单
+    @PostMapping("/addRestackMakeResult")
+    public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
+        Map<String, Object> resTfulResult = wmsFeign.editRestackMakeResult(mapVal);
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的仓库信息
+    @PostMapping("/selectAfterWarehouseByResultId/{resultId}")
+    public Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //渲染倒垛后的垛位信息
+    @PostMapping("/selectAfterstackingByResultId/{resultId}")
+    public Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId) {
+        Map<String, Object> resTfulResult = wmsFeign.selectAfterWarehouseByResultId(resultId);
+        return resTfulResult;
+    }
+
+    //PDA展示倒垛单
+    @PostMapping("/selectRestackForPDA")
+    public Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackForPDA(map);
+        return resTfulResult;
+    }
+
+    //PDA根据实绩id查找物资信息
+    @PostMapping("/selectMaterialInfoByResultId")
+    public Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectMaterialInfoByResultId(map);
+        return resTfulResult;
+    }
+
+    //PDA根据仓库id查找倒垛单
+    @PostMapping("/selectRestackByWarehouseId")
+    public Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String, Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
         return resTfulResult;
-  }
-  //PDA根据仓库id查找倒垛单
-  @PostMapping("/selectRestackByWarehouseId")
-  public Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String,Object> map){
-      Map<String,Object> resTfulResult = wmsFeign.selectRestackByWarehouseId(map);
-      return resTfulResult;
-  }
-  //扫描吊牌添加扫描实绩
-  @PostMapping("/ScanTagResult")
-  public Map<String,Object> ScanTagResult(@RequestBody(required = false) Map<String,Object> mal){
-      Map<String,Object> resTfulResult = wmsFeign.ScanTagResult(mal);
-      return resTfulResult;
-  }
-  //下发
-  @PostMapping("/Issue")
-  public Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList){
-      Map<String,Object> resTfulResult = wmsFeign.Issue(mapList);
-      return resTfulResult;
-  }
+    }
+
+    //扫描吊牌添加扫描实绩
+    @PostMapping("/ScanTagResult")
+    public Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal) {
+        Map<String, Object> resTfulResult = wmsFeign.ScanTagResult(mal);
+        return resTfulResult;
+    }
+
+    //下发
+    @PostMapping("/Issue")
+    public Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList) {
+        Map<String, Object> resTfulResult = wmsFeign.Issue(mapList);
+        return resTfulResult;
+    }
+
     /**
      * 2.展示退库实绩信息
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
@@ -260,11 +295,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "161", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsReboundResult( Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-        return wmsFeign.getWmsReboundResult(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsReboundResult(Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsReboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
 
@@ -273,16 +308,17 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "162", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundResult( Map<String, Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-        return wmsFeign.getWmsIvboundResult(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsIvboundResult(Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        return wmsFeign.getWmsIvboundResult(mapValue, apiId, pageNum, pageSize);
     }
 
 
     /**
      * 展示倒库物资实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
@@ -294,11 +330,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "163", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getWmsIvboundMaterial( Map<String, Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize){
-        return wmsFeign.getWmsIvboundMaterial(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getWmsIvboundMaterial(Map<String, Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        return wmsFeign.getWmsIvboundMaterial(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryCheck")
@@ -306,11 +342,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "94", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryCheck( Map<String, Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize){
-        return wmsFeign.getInventoryCheck(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getInventoryCheck(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryCheck(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getInventoryClose")
@@ -318,11 +354,11 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "95", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getInventoryClose( Map<String, Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize){
-        return wmsFeign.getInventoryClose(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getInventoryClose(Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        return wmsFeign.getInventoryClose(mapValue, apiId, pageNum, pageSize);
     }
 
     @PostMapping("/getSendReceive")
@@ -330,85 +366,93 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "97", required = false, dataType = "BigDecimal"),
     })
-    public RESTfulResult getSendReceive( Map<String, Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize){
-        return wmsFeign.getSendReceive(mapValue,apiId,pageNum,pageSize);
+    public RESTfulResult getSendReceive(Map<String, Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize) {
+        return wmsFeign.getSendReceive(mapValue, apiId, pageNum, pageSize);
     }
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发吊钢工扫描吊牌实绩")
     @PostMapping("/getTagResult")
-    public Map<String,Object> getTagResult(){
+    public Map<String, Object> getTagResult() {
         return wmsFeign.getTagResult();
     }
 
     /**
-     *  展示正常入库吊钢工扫描吊牌实绩
+     * 展示正常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示正常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示正常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagResult")
-    public Map getIssuedTagResult(){
+    public Map getIssuedTagResult() {
         return wmsFeign.getIssuedTagResult();
     }
 
     /**
      * 展示异常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示异常入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示异常入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIssuedTagNoResult")
-    public Map getIssuedTagNoResult(){
+    public Map getIssuedTagNoResult() {
         return wmsFeign.getIssuedTagNoResult();
     }
 
     /**
      * 展示已退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReIssuedResult")
-    public Map getReIssuedResult(){
+    public Map getReIssuedResult() {
         return wmsFeign.getIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getReTagResult")
-    public Map getReTagResult(){
+    public Map getReTagResult() {
         return wmsFeign.getReTagResult();
     }
 
     /**
      * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示已倒库入库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示已倒库入库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvIssuedResult")
-    public Map getIvIssuedResult(){
+    public Map getIvIssuedResult() {
         return wmsFeign.getIvIssuedResult();
     }
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @ApiOperation(value="展示未下发退库吊钢工扫描吊牌实绩")
+    @ApiOperation(value = "展示未下发退库吊钢工扫描吊牌实绩")
     @PostMapping("/getIvTagResult")
-    public Map getIvTagResult(){
+    public Map getIvTagResult() {
         return wmsFeign.getIvTagResult();
     }
 
     /**
      * 新增入库实绩
+     *
      * @param mapList
      * @return
      */
@@ -423,12 +467,12 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertInboundResult(mapList);
         return stackNo;
@@ -436,6 +480,7 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
 
     /**
      * 新增退库实绩
+     *
      * @param mapList
      * @return
      */
@@ -450,12 +495,12 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertReboundResult(mapList);
         return stackNo;
@@ -463,6 +508,7 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
 
     /**
      * 新增倒库入库实绩
+     *
      * @param mapList
      * @return
      */
@@ -477,80 +523,88 @@ public Map<String,Object> insertOutBoundResult(@RequestBody(required = false) Ma
         /*
         获取入库垛位
          */
-        Map<String,Object> map1=qmsFeign.getStackingId(new BigDecimal(1),size);
-        String stackNo=(String) map1.get("stackNo");
-        BigDecimal stackId=new BigDecimal(map1.get("stackId").toString());
-        for (Map<String,Object> map:mapList
-        ){
-            map.put("stackingId",stackId);
+        Map<String, Object> map1 = qmsFeign.getStackingId(new BigDecimal(1), size);
+        String stackNo = (String) map1.get("stackNo");
+        BigDecimal stackId = new BigDecimal(map1.get("stackId").toString());
+        for (Map<String, Object> map : mapList
+        ) {
+            map.put("stackingId", stackId);
         }
         wmsFeign.insertIvboundResult(mapList);
         return stackNo;
     }
+
     /**
-     *展示入库垛位
+     * 展示入库垛位
+     *
      * @param DriverId
      * @return
      */
     @PostMapping("/getInboundStack")
     @ApiOperation(value = "展示入库垛位")
-    public Integer getInboundStack(Integer DriverId){
+    public Integer getInboundStack(Integer DriverId) {
         return wmsFeign.getInboundStack(DriverId);
     }
+
     /**
      * 新增库存盘点
+     *
      * @param map
      * @return
      */
     @PostMapping("/inventoryCheck")
     @ApiOperation(value = "新增库存盘点")
-    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String,Object> map) {
+    public Map<String, Object> inventoryCheck(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.inventoryCheck(map);
     }
 
     /**
      * 新增入库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增入库扫描吊牌实绩")
     @PostMapping("/insertResult")
     @Transactional
-    public Map<String,Object> insertResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertResult(map);
     }
 
     /**
      * 新增退库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增退库扫描吊牌实绩")
     @PostMapping("/insertReboundScanResult")
     @Transactional
-    public Map<String,Object> insertReboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertReboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertReboundScanResult(map);
     }
 
     /**
      * 新增倒库入库扫描吊牌实绩
+     *
      * @param map
      * @return
      */
     @ApiOperation(value = "新增倒库入库扫描吊牌实绩")
     @PostMapping("/insertIvboundScanResult")
     @Transactional
-    public Map<String,Object> insertIvboundScanResult(@RequestBody(required = false)Map<String,Object>map){
+    public Map<String, Object> insertIvboundScanResult(@RequestBody(required = false) Map<String, Object> map) {
         return wmsFeign.insertIvboundScanResult(map);
     }
-/**
- *  根据实绩id查找物资唯一编码是否已经稽核完成
- */
-@PostMapping("/selectMaterialSteelIdByReusltId")
-@Transactional
-public Map<String,Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false)Map<String,Object>map){
-    return wmsFeign.selectMaterialSteelIdByReusltId(map);
-}
+
+    /**
+     * 根据实绩id查找物资唯一编码是否已经稽核完成
+     */
+    @PostMapping("/selectMaterialSteelIdByReusltId")
+    @Transactional
+    public Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map) {
+        return wmsFeign.selectMaterialSteelIdByReusltId(map);
+    }
 
 
 }

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

@@ -36,10 +36,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult",method = RequestMethod.POST)
-    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false)
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize);
+    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam String con);
 
     /**
      * 新增出库实绩
@@ -76,10 +77,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList",method = RequestMethod.POST)
-    Map<String,Object> selectGridMaterialList(@RequestBody(required = false)
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize);
+    Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String,Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam String con);
 
     /**
      * 钢材异地库出库扫描
@@ -97,10 +99,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false)
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize);
+    Map<String,Object> getWmsOffsiteLibaryOutboundList(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con);
 
     /**
      * 展示钢材异地库入库实绩表
@@ -110,10 +113,11 @@ public interface WMSFeign {
      * @return
      */
     @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false)
+    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
                                                        @RequestParam Integer apiId,
                                                        @RequestParam Integer pageNum,
-                                                       @RequestParam Integer pageSize);
+                                                       @RequestParam Integer pageSize,
+                                                      @RequestParam String con);
 
     /**
      *   钢材异地库入库扫描新增异地库入库实绩
@@ -202,7 +206,7 @@ public interface WMSFeign {
      * @param stackingId
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
     Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
                                              @RequestParam  Integer stackingId );
 
@@ -211,14 +215,14 @@ public interface WMSFeign {
      * @param warehouseid
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
     Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
 
     /**
      * 下拉框获取仓库名称
      * @return
      */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
     Map<String,Object> selectWarehouse();
 
     /**
@@ -373,7 +377,7 @@ public interface WMSFeign {
      * 展示未下发吊钢工扫描吊牌实绩
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getTagResult",method = RequestMethod.POST)
+    @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
     Map<String,Object>  getTagResult();
 
     /**