2.14收发存

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

@@ -341,11 +341,11 @@ public class AMScontroller{
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId,
-                                              String con) {
+                                              String con,String sendCompId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con);
+        return amsFeign.getPurchaseOrderList(mapValue, pageNum, pageSize, apiId, con, sendCompId);
     }
 
     /**
@@ -411,13 +411,14 @@ public class AMScontroller{
     @PostMapping("/getAmsContractTransportPrice1")
     @ApiOperation(value = "查询汽运单价信息")
     public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer apiId) {
+                                                             Integer pageNum,
+                                                             Integer pageSize,
+                                                             Integer apiId,
+                                                             Integer deleted) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId, deleted);
     }
 
     /**
@@ -456,8 +457,8 @@ public class AMScontroller{
      */
     @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
-        return amsFeign.batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map) {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1(map);
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -475,6 +476,18 @@ public class AMScontroller{
         return amsFeign.getDeliveryAddress();
     }
 
+    @GetMapping("getCargoName")
+    @ApiOperation(value = "获取货物类型")
+    public Map<String, Object> getCargoName(){
+        return amsFeign.getCargoName();
+    }
+
+    @GetMapping("getOilTypeName")
+    @ApiOperation(value = "获取油品名称")
+    public Map<String, Object> getOilTypeName(){
+        return amsFeign.getOilTypeName();
+    }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);
@@ -1397,11 +1410,11 @@ public class AMScontroller{
                                                          Integer pageNum,
                                                          Integer pageSize,
                                                          Integer apiId,
-                                                         String index) {
+                                                         String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,index);
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId,con);
     }
 
     /*

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({
@@ -835,9 +849,9 @@ public class RMScontroller {
 
     @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
-    @PostMapping(value = "/updateOilPrice", produces  = "application/json;charset=UTF-8")
-    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.updateOilPrice(map);
+    @PostMapping(value = "/updateOilPrice/{id}")
+    public Map<String, Object> updateOilPrice(@PathVariable("id") Integer id) {
+        return rmsFeign.updateOilPrice(id);
     }
 
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
@@ -1066,4 +1080,17 @@ public class RMScontroller {
         return rmsFeign.isInHere(personnelJobNumber);
     }
 
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @ApiImplicitParam(name = "oilTypeName", value = "油品名称", required = true, dataType = "String")
+    @PostMapping(value = "/addOilType")
+    public Map<String, Object> addOilType(String oilTypeName){
+        return rmsFeign.addOilType(oilTypeName);
+    }
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "/oilNameSelect")
+    public Map<String, Object> oilNameSelect(){
+        return rmsFeign.oilNameSelect();
+    }
 }

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

@@ -1940,7 +1940,7 @@ public class TMSController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                             String startTime, String endTime,
+                                               String startTime, String endTime,
                                                Integer orderType
     ){
         return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
@@ -1966,21 +1966,6 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
     }
 
-//    @ApiOperation(value="查询内转统计报表")
-//    @PostMapping("/getAllInwardResult")
-//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
-//                                                Integer apiId,
-//                                                Integer pageNum,
-//                                                Integer pageSize,
-//                                                String startTime, String endTime,
-//                                                String carrierSsoId
-//    ){
-//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
-//    }
-
-
-
-
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2012,4 +1997,15 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getSporadicSuppliesReport2(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,userId,userIds,con,orderType);
     }
+
+    @ApiOperation(value="查询采购内转运输实绩")
+    @PostMapping("/getPurInwardReport")
+    public Map<String, Object> getPurInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          String startTime,
+                                                          String endTime){
+        return tmsTruckFeign.getPurInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
 }

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

@@ -158,8 +158,8 @@ public class UniversalController extends BaseRESTfulController {
         if(index != null){
             mapValue.put("index", index);
         }
-        if (con != null&&con.equals("undefined")){
-            mapValue.put("con","%"+con+"%");
+        if (con != null&& !con.equals("undefined")){
+            mapValue.put("con",con);
         }
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;

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

@@ -33,7 +33,7 @@ public class WMSController extends BaseRESTfulController {
     @PostMapping("getWmsInboundResult")
     @ApiOperation(value = "展示入库实绩信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "90", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "apiId", value = "371", required = false, dataType = "BigDecimal"),
     })
     public Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    Integer apiId,
@@ -228,14 +228,14 @@ public class WMSController extends BaseRESTfulController {
 
     //删除倒垛单
     @PostMapping("/deleteByResultId/{resultId}")
-    public Map<String, Object> deleteByResultId(@PathVariable Integer resultId) {
+    public Map<String, Object> deleteByResultId(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.deleteByResultId(resultId);
         return resTfulResult;
     }
 
     //下发倒垛单
     @PostMapping("/dispatchDistrubtionStatus/{resultId}")
-    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable Integer resultId) {
+    public Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId) {
         Map<String, Object> resTfulResult = wmsFeign.dispatchDistrubtionStatus(resultId);
         return resTfulResult;
     }
@@ -273,6 +273,17 @@ public class WMSController extends BaseRESTfulController {
                                                  Integer DistrubtionStatus) {
         return wmsFeign.selectRestackList(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
     }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "119", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/selectRestackList2")
+    public Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId,
+                                                 Integer DistrubtionStatus) {
+        return wmsFeign.selectRestackList2(mapVal==null?new HashMap<>():mapVal,apiId, pageNum, pageSize, DistrubtionStatus);
+    }
 
     @PostMapping("/editRestackMakeResult")
     public Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapVal) {
@@ -773,9 +784,70 @@ public class WMSController extends BaseRESTfulController {
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid){
         return wmsFeign.getNewDistribute(personnelWorkshopid);
     }
+
     //收发存
     @PostMapping("/addSendReceive")
-    public RESTfulResult addSendReceive(){
-        return  wmsFeign.addSendReceive();
+    public RESTfulResult addSendReceive() {
+        return wmsFeign.addSendReceive();
+    }
+
+        //    获取物资类型
+        @PostMapping(value = "/getMaterialTypeList")
+        public Map<String, Object> getMaterialTypeList (@RequestParam("warehouseid") String warehouseid,
+                @RequestParam("stackingId") BigDecimal stackingId,
+                @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                @RequestParam("pageNum") Integer pageNum,
+                @RequestParam("pageSize") Integer pageSize,
+                @RequestParam("apiId") Integer apiId){
+            return wmsFeign.getMaterialTypeList(warehouseid, stackingId, gradtionNumber, pageNum, pageSize, apiId);
+        }
+
+//    创建倒垛单
+        @PostMapping(value = "/createRestackMakeResult")
+        public Map<String, Object> createRestackMakeResult (@RequestParam("keeperId") BigDecimal keeperId,
+                @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                @RequestParam("resultRemark") String resultRemark,
+                @RequestBody(required = false) List < Map < String, Object >> mps){
+            return wmsFeign.createRestackMakeResult(keeperId, beforeLevel, afterStackingId, afterWarehouseId, afterBeforeStackingId, resultRemark, mps);
+        }
+        //PDA根据仓库id查找倒垛单
+        @GetMapping(value = "selectRestackByWarehouseIds")
+        public Map<String, Object> selectRestackByWarehouseIds (@RequestParam("warehouseid") String warehouseid){
+            return wmsFeign.selectRestackByWarehouseIds(warehouseid);
+        }
+        //修改实时库存,针对倒垛
+        @PostMapping(value = "/updateWmspGridMaterialForRestack")
+        public Map<String, Object> updateWmspGridMaterialForRestack (@RequestBody Map < String, Object > mapValue){
+            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/AmsFeign.java

@@ -283,7 +283,8 @@ public interface AmsFeign {
     Map<String, Object> getPurchaseOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId, @RequestParam String con
+                                       @RequestParam Integer apiId, @RequestParam String con,
+                                       @RequestParam String sendCompId
                                              );
 
 
@@ -331,9 +332,12 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPrice1")
     Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId,
+                                       @RequestParam("deleted") Integer deleted
+
+    );
     /**
      *销售合同新增汽运单价
      */
@@ -366,7 +370,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
     })
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1(@RequestBody Map<String,Object> map);
     /**
      * 获取线路编号
      * @param
@@ -397,6 +401,27 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
+    /**
+     * 获取货物类型
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取货物类型")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCargoName")
+    Map<String, Object> getCargoName();
+    /**
+     * 获取油品名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取油品名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getOilTypeName")
+    Map<String, Object> getOilTypeName();
+
     /**
      * 新增(固定派单/公开抢单)
      * @param mapVal
@@ -1338,7 +1363,7 @@ public interface AmsFeign {
                                                   @RequestParam("pageNum") Integer pageNum,
                                                   @RequestParam("pageSize") Integer pageSize,
                                                   @RequestParam("apiId") Integer apiId,
-                                                  @RequestParam("index") String index);
+                                                  @RequestParam("con") String con);
 
     @ApiOperation(value="查询销售订单物资信息")
     @ApiImplicitParams({

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);
@@ -441,8 +450,8 @@ public interface RmsFeign {
     Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
 
     //更新油价
-    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
-    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice/{id}")
+    Map<String, Object> updateOilPrice(@PathVariable("id") Integer id);
 
     //根据id获取油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")
@@ -579,4 +588,14 @@ public interface RmsFeign {
     @ApiOperation(value = "边输边查收货客户父节点")
     @PostMapping(value = "api/v1/rms/rmspersonnel/isInHere")
     Integer isInHere(@RequestParam String personnelJobNumber);
+
+    @ApiOperation(value="创建", notes="添加油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/addOilType")
+    Map<String, Object> addOilType(@RequestParam String oilTypeName);
+
+    @ApiOperation(value="创建", notes="查询油品名称")
+    @PostMapping(value = "api/v1/rms/rmsoilprice/oilNameSelect")
+    Map<String, Object> oilNameSelect();
+
+
 }

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

@@ -425,6 +425,14 @@ public interface TmsTruckFeign {
                                          @RequestParam("carrierSsoId")   String carrierSsoId
     );
 
+    //采购内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getPurInwardReport")
+    Map<String, Object> getPurInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam String startTime,
+                                           @RequestParam String endTime);
 }
 
 

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

@@ -19,184 +19,201 @@ import java.util.Map;
 public interface WMSFeign {
     /**
      * 钢材入库实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult",method = RequestMethod.POST)
-    Map<String,Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer apiId,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam String con);
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResult", method = RequestMethod.POST)
+    Map<String, Object> getWmsInboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
 
     /**
      * 展示出库实绩
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult",method = RequestMethod.POST)
-    Map<String,Object> getWmspOutboundResult(@RequestBody(required = false) Map<String,Object> map,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                             @RequestParam Integer pageSize,
-                                             @RequestParam String con);
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/getWmspOutboundResult", method = RequestMethod.POST)
+    Map<String, Object> getWmspOutboundResult(@RequestBody(required = false) Map<String, Object> map,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam String con);
 
     /**
      * 新增出库实绩
+     *
      * @param mapval
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult",method = RequestMethod.POST)
-    Map<String,Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
+    @RequestMapping(value = "/api/v1/wms/wmspoutboundresults/insertWmspOutBoundResult", method = RequestMethod.POST)
+    Map<String, Object> insertWmspOutBoundResult(@RequestBody(required = false) Map<String, Object> mapval);
 
     /**
      * 逻辑删除出库单
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspoutboundresults/deletewmspOutboundResult")
-    Map<String,Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
+    Map<String, Object> deleteWmspOutboundResult(@RequestParam Integer resultId);
 
     /**
      * 新增出库扫描实绩
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
-    Map<String,Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
 
     /**
      * 装卸工PDA前端点击出库
+     *
      * @param resultId
      * @return
      */
     @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
-    Map<String,Object> outbountResultToSuccess(@RequestParam Integer resultId);
+    Map<String, Object> outbountResultToSuccess(@RequestParam Integer resultId);
 
     /**
      * 更新出库状态
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspoutboundresults/updataResultStatus")
-    Map<String,Object> updataResultStatus(@RequestBody(required = false)Integer resultId);
+    Map<String, Object> updataResultStatus(@RequestBody(required = false) Integer resultId);
 
     @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getRmsMaterial")
-    Map<String,Object> getRmsMaterial(@RequestBody(required = false)Map<String, Object> mapval);
+    Map<String, Object> getRmsMaterial(@RequestBody(required = false) Map<String, Object> mapval);
 
     /**
-     *  展示实时库存数据
+     * 展示实时库存数据
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList",method = RequestMethod.POST)
-    Map<String,Object> selectGridMaterialList(@RequestBody(required = false) Map<String,Object> map,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam String con);
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialList", method = RequestMethod.POST)
+    Map<String, Object> selectGridMaterialList(@RequestBody(required = false) Map<String, Object> map,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam String con);
 
     /**
-     *  通过成品仓库网格ID查询实时库存数据
+     * 通过成品仓库网格ID查询实时库存数据
+     *
      * @param gridId
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId",method = RequestMethod.POST)
-    Map<String,Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
+    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/selectGridMaterialListByGridId", method = RequestMethod.POST)
+    Map<String, Object> selectGridMaterialListByGridId(@RequestParam BigDecimal gridId);
 
     /**
-     *  修改物资钢材表的质量是否合格字段和逻辑删除
+     * 修改物资钢材表的质量是否合格字段和逻辑删除
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspgridmaterials/updateRmsMaterialSteelDemotion")
-    Map<String,Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String,Object> map);
+    Map<String, Object> updateRmsMaterialSteelDemotion(@RequestBody Map<String, Object> map);
 
     /**
      * 钢材异地库出库扫描
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/OutScanResultTag")
-    Map<String,Object> OutScanResultTag(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> OutScanResultTag(@RequestBody(required = false) Map<String, Object> map);
 
     /**
      * 获取钢材异地库出库数据
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList",method = RequestMethod.POST)
-    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);
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getWmsOffsiteLibaryOutboundList", method = RequestMethod.POST)
+    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);
 
     /**
      * 展示钢材异地库入库实绩表
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList",method = RequestMethod.POST)
-    Map<String,Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String,Object> map,
-                                                      @RequestParam Integer apiId,
-                                                      @RequestParam Integer pageNum,
-                                                      @RequestParam Integer pageSize,
-                                                      @RequestParam String con);
+    @RequestMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/getWmsOffsiteLibaryInboundList", method = RequestMethod.POST)
+    Map<String, Object> getWmsOffsiteLibaryInboundList(@RequestBody(required = false) Map<String, Object> map,
+                                                       @RequestParam Integer apiId,
+                                                       @RequestParam Integer pageNum,
+                                                       @RequestParam Integer pageSize,
+                                                       @RequestParam String con);
 
     /**
-     *   钢材异地库入库扫描新增异地库入库实绩
+     * 钢材异地库入库扫描新增异地库入库实绩
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/insertOffsiteLibraryInbound")
-    Map<String,Object> insertOffsiteLibraryInbound(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> insertOffsiteLibraryInbound(@RequestBody(required = false) Map<String, Object> map);
 
     /**
-     *  //展示在途库存列表
+     * //展示在途库存列表
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory",method = RequestMethod.POST)
-    Map<String,Object> getWmspIntransitInventory(@RequestBody(required = false)Map<String,Object>mapval,
-                                                     @RequestParam Integer apiId,
-                                                     @RequestParam Integer pageNum,
-                                                     @RequestParam Integer pageSize,
-                                                     @RequestParam String con);
-
+    @RequestMapping(value = "/api/v1/wms/wmspintransitinventorys/getWmspIntransitInventory", method = RequestMethod.POST)
+    Map<String, Object> getWmspIntransitInventory(@RequestBody(required = false) Map<String, Object> mapval,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
 
 
     /**
-     *新增倒库出库实绩
+     * 新增倒库出库实绩
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertOutBoundResult")
-    Map<String,Object> insertOutBoundResult(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> insertOutBoundResult(@RequestBody(required = false) Map<String, Object> map);
 
     /**
      * //新增倒库出库扫描实绩
+     *
      * @param mapval
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/AddWmspOutboundScanResult")
-    Map<String,Object> AddWmspOutboundScanResult(@RequestBody(required = false)Map<String,Object> mapval);
+    Map<String, Object> AddWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> mapval);
 
     /**
      * 通过下拉框筛选数据
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
@@ -206,72 +223,78 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getWmspRestackMakeResultList")
-    Map<String,Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String,Object> map,
-                                                    @RequestParam Integer apiId,
-                                                    @RequestParam Integer pageNum,
-                                                    @RequestParam Integer pageSize,
-                                                    @RequestParam Integer warehouseid,
-                                                    @RequestParam Integer stackingId,
-                                                    @RequestParam Integer gradtionNumber
+    Map<String, Object> getWmspRestackMakeResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                     @RequestParam Integer apiId,
+                                                     @RequestParam Integer pageNum,
+                                                     @RequestParam Integer pageSize,
+                                                     @RequestParam Integer warehouseid,
+                                                     @RequestParam Integer stackingId,
+                                                     @RequestParam Integer gradtionNumber
     );
 
     /**
-     *    添加倒垛单实绩
+     * 添加倒垛单实绩
+     *
      * @param mapval
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    Map<String,Object> addRestackMakeResult(@RequestBody  Map<String,Object> mapval);
+    Map<String, Object> addRestackMakeResult(@RequestBody Map<String, Object> mapval);
 
 
     @PostMapping("/api/v1/wms/wmsprestackdrivingresults/updateInstruction")
     Map<String, Object> updateInstruction(@RequestBody Map<String, Object> map);
 
 
-
     /**
-     *   删除倒垛单
+     * 删除倒垛单
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/deleteByResultId/{resultId}")
-    Map<String,Object> deleteByResultId(@PathVariable Integer resultId);
+    Map<String, Object> deleteByResultId(@PathVariable String resultId);
 
     /**
      * 下发倒垛单pc端
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{resultId}")
-    Map<String,Object> dispatchDistrubtionStatus(@PathVariable Integer resultId);
+    Map<String, Object> dispatchDistrubtionStatus(@PathVariable String resultId);
 
     /**
      * 下拉框获取层次
+     *
      * @param warehouseid
      * @param stackingId
      * @return
      */
     @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectGardationNumber")
-    Map<String,Object> selectGardationNumber(@RequestParam Integer warehouseid,
-                                             @RequestParam  Integer stackingId );
+    Map<String, Object> selectGardationNumber(@RequestParam Integer warehouseid,
+                                              @RequestParam Integer stackingId);
 
     /**
-     *   下拉框获取垛位
+     * 下拉框获取垛位
+     *
      * @param warehouseid
      * @return
      */
     @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
-    Map<String,Object> selectStackingId(@RequestParam Integer warehouseid);
+    Map<String, Object> selectStackingId(@RequestParam Integer warehouseid);
 
     /**
      * 下拉框获取仓库名称
+     *
      * @return
      */
     @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
-    Map<String,Object> selectWarehouse();
+    Map<String, Object> selectWarehouse();
 
     /**
-     *展示倒垛单
+     * 展示倒垛单
+     *
      * @param apiId
      * @param pageNum
      * @param pageSize
@@ -279,95 +302,117 @@ public interface WMSFeign {
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList")
-    Map<String,Object>       selectRestackList     (@RequestBody(required = false) Map<String,Object> map,
-                                                    @RequestParam Integer apiId,
-                                                    @RequestParam Integer pageNum,
-                                                    @RequestParam Integer pageSize,
-                                                    @RequestParam Integer DistrubtionStatus
+    Map<String, Object> selectRestackList(@RequestBody(required = false) Map<String, Object> map,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer DistrubtionStatus
     );
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackList2")
+    Map<String, Object> selectRestackList2(@RequestBody(required = false) Map<String, Object> map,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer DistrubtionStatus
+    );
+
     /**
-     *  修改倒垛单
+     * 修改倒垛单
+     *
      * @param mapval
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/editRestackMakeResult")
-    Map<String,Object> editRestackMakeResult(@RequestBody(required = false)Map<String,Object> mapval);
+    Map<String, Object> editRestackMakeResult(@RequestBody(required = false) Map<String, Object> mapval);
+
     /**
-     *   渲染倒垛后的仓库信息
+     * 渲染倒垛后的仓库信息
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{resultId}")
-    Map<String,Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+    Map<String, Object> selectAfterWarehouseByResultId(@PathVariable Integer resultId);
+
     /**
-     *  渲染倒垛后的垛位信息
+     * 渲染倒垛后的垛位信息
+     *
      * @param resultId
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterstackingByResultId/{resultId}")
-    Map<String,Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
+    Map<String, Object> selectAfterstackingByResultId(@PathVariable Integer resultId);
 
     /**
      * PDA展示倒垛单
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
-    Map<String,Object> selectRestackForPDA(@RequestBody(required = false)Map<String,Object> map);
-
-
+    Map<String, Object> selectRestackForPDA(@RequestBody(required = false) Map<String, Object> map);
 
 
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/getRestackInfoByResultId")
-    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getRestackInfoByResultId(@RequestBody(required = false) Map<String, Object> mapVal,
                                                   @RequestParam Integer pageNum,
                                                   @RequestParam Integer pageSize,
                                                   @RequestParam Integer apiId
 
     );
+
     /**
      * PDA根据实绩id查找物资信息
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectMaterialInfoByResultId")
-    Map<String,Object> selectMaterialInfoByResultId(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> selectMaterialInfoByResultId(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * PDA根据仓库id查找倒垛单
+     *
      * @param map
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseId")
-    Map<String,Object> selectRestackByWarehouseId(@RequestBody(required = false)Map<String,Object> map);
+    Map<String, Object> selectRestackByWarehouseId(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 库管员扫描吊牌添加扫描实绩
+     *
      * @param mal
      * @return
      */
 
-   @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
-   Map<String,Object> ScanTagResult(@RequestBody(required = false)Map<String,Object> mal);
-
+    @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/ScanTagResult")
+    Map<String, Object> ScanTagResult(@RequestBody(required = false) Map<String, Object> mal);
 
 
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
-    Map<String,Object> getScanResult(@RequestBody(required = false) Map<String,Object> map);
+    Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
+
     /**
      * 库管员下发倒垛单
+     *
      * @param mapList
      * @return
      */
     @PostMapping(value = "/api/v1/wms/wmsprestackscanresults/Issue")
-    Map<String,Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+    Map<String, Object> Issue(@RequestBody(required = false) List<Map<String, Object>> mapList);
+
     /**
      * 展示退库实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getWmsReboundResult", method = RequestMethod.POST)
     RESTfulResult getWmsReboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
@@ -375,51 +420,52 @@ public interface WMSFeign {
                                       @RequestParam String con);
 
 
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/selectScanResultByIboundResultId", method = RequestMethod.POST)
     RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize,
                                                    @RequestParam Integer inboundId
-                                                   );
+    );
 
     //根据物资信息查找暂存的垛位
     @PostMapping("/api/v1/wms/reboundResult/selectInfoByMaterialCode")
-    Map<String,Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String,Object> mal);
+    Map<String, Object> selectInfoByMaterialCode(@RequestBody(required = false) Map<String, Object> mal);
 
     //根据仓库id查询未接收的垛位
     @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
-    Map<String,Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String,Object> mal);
+    Map<String, Object> selectStackingInfoByWarehouseId(@RequestBody(required = false) Map<String, Object> mal);
 
     //更新垛位
     @PostMapping("/api/v1/wms/inboundScanResult/updateStatus")
-    Map<String,Object> updateStatus(@RequestBody(required = false) Map<String,Object> mal);
+    Map<String, Object> updateStatus(@RequestBody(required = false) Map<String, Object> mal);
+
     /**
      * 展示倒库实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsIvboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsIvboundResult", method = RequestMethod.POST)
     RESTfulResult getWmsIvboundResult(@RequestBody(required = false) Map<String, Object> mapValue,
                                       @RequestParam Integer apiId,
                                       @RequestParam Integer pageNum,
                                       @RequestParam Integer pageSize);
 
 
-
-
     /**
      * 展示倒库物资实绩
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getWmsIvboundMaterial",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getWmsIvboundMaterial", method = RequestMethod.POST)
     RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
                                         @RequestParam Integer apiId,
                                         @RequestParam Integer pageNum,
@@ -428,7 +474,7 @@ public interface WMSFeign {
     /**
      * 库存盘点实绩
      */
-    @RequestMapping(value = "/api/v1/wms/inventoryCheck/getInventoryCheck",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inventoryCheck/getInventoryCheck", method = RequestMethod.POST)
     RESTfulResult getInventoryCheck(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
@@ -438,13 +484,14 @@ public interface WMSFeign {
 
     /**
      * 库存结转
+     *
      * @param mapValue
      * @param apiId
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inventoryClose/getInventoryClose",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inventoryClose/getInventoryClose", method = RequestMethod.POST)
     RESTfulResult getInventoryClose(@RequestBody(required = false) Map<String, Object> mapValue,
                                     @RequestParam Integer apiId,
                                     @RequestParam Integer pageNum,
@@ -454,7 +501,7 @@ public interface WMSFeign {
     /**
      * 收发存报表
      */
-    @RequestMapping(value = "/api/v1/wms/sendReceive/getSendReceive",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/sendReceive/getSendReceive", method = RequestMethod.POST)
     RESTfulResult getSendReceive(@RequestBody(required = false) Map<String, Object> mapValue,
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
@@ -465,134 +512,150 @@ public interface WMSFeign {
 
     /**
      * 展示未下发吊钢工扫描吊牌实绩
+     *
      * @return
      */
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
-    Map<String,Object>  getTagResult();
+    Map<String, Object> getTagResult();
 
     /**
      * 展示已入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagResult",method = RequestMethod.POST)
-    Map<String,Object>  getIssuedTagResult();
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedTagResult();
 
     /**
      * 展示异常入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagNoResult",method = RequestMethod.POST)
-    Map<String,Object>  getIssuedTagNoResult();
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIssuedTagNoResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedTagNoResult();
 
     /**
      * 展示退库已下发吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult",method = RequestMethod.POST)
-    Map<String,Object>  getIssuedResult();
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReIssuedResult", method = RequestMethod.POST)
+    Map<String, Object> getIssuedResult();
 
     /**
      * 展示未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult",method = RequestMethod.POST)
-    Map<String,Object>  getReTagResult();
+    @RequestMapping(value = "/api/v1/wms/reboundResult/getReTagResult", method = RequestMethod.POST)
+    Map<String, Object> getReTagResult();
 
     /**
      * 展示已倒库入库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvIssuedResult",method = RequestMethod.POST)
-    Map<String,Object>  getIvIssuedResult();
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvIssuedResult", method = RequestMethod.POST)
+    Map<String, Object> getIvIssuedResult();
 
     /**
      * 展示倒库入库未下发退库吊钢工扫描吊牌实绩
+     *
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvTagResult",method = RequestMethod.POST)
-    Map<String,Object>  getIvTagResult();
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/getIvTagResult", method = RequestMethod.POST)
+    Map<String, Object> getIvTagResult();
 
     /**
      * 新增入库实绩，返回选择垛位
+     *
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult",method = RequestMethod.POST)
-    Map<String,Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertInboundResult", method = RequestMethod.POST)
+    Map<String, Object> insertInboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增退库实绩，返回选择垛位
+     *
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/reboundResult/insertReboundResult", method = RequestMethod.POST)
     String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
 
     /**
      * 新增倒库入库实绩，返回选择垛位
+     *
      * @param mapList
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/insertIvboundResult",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundResult/insertIvboundResult", method = RequestMethod.POST)
     String insertIvboundResult(@RequestBody List<Map<String, Object>> mapList);
+
     /**
      * 行车工查看垛位
+     *
      * @param DriverId
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
-    Integer  getInboundStack(@RequestParam Integer DriverId);
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack", method = RequestMethod.POST)
+    Integer getInboundStack(@RequestParam Integer DriverId);
 
 
     /**
      * 新增库存盘点
+     *
      * @param map
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack",method = RequestMethod.POST)
-    Map<String,Object>  inventoryCheck(@RequestBody Map<String,Object> map);
+    @RequestMapping(value = "/api/v1/wms/inboundStack/getInboundStack", method = RequestMethod.POST)
+    Map<String, Object> inventoryCheck(@RequestBody Map<String, Object> map);
 
 
     /**
      * 新增入库扫描实绩
+     *
      * @param map
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertResult",method = RequestMethod.POST)
-    Map<String, Object> insertResult(@RequestBody  Map<String, Object> map);
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertResult", method = RequestMethod.POST)
+    Map<String, Object> insertResult(@RequestBody Map<String, Object> map);
 
 
     /**
      * 新增退库扫描实绩
+     *
      * @param map
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertReboundScanResult",method = RequestMethod.POST)
-    Map<String, Object> insertReboundScanResult(@RequestBody  Map<String, Object> map);
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertReboundScanResult", method = RequestMethod.POST)
+    Map<String, Object> insertReboundScanResult(@RequestBody Map<String, Object> map);
 
 
     /**
-     *新增倒库入库扫描实绩
+     * 新增倒库入库扫描实绩
+     *
      * @param map
      * @return
      */
-    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult",method = RequestMethod.POST)
-    Map<String, Object> insertIvboundScanResult(@RequestBody  Map<String, Object> map);
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/insertIvboundScanResult", method = RequestMethod.POST)
+    Map<String, Object> insertIvboundScanResult(@RequestBody Map<String, Object> map);
+
     /**
      * 根据实绩id查找物资是否稽核完成
-     *
      */
     @PostMapping(value = "/api/vi/wms/wmsprestackscanresults/selectMaterialSteelIdByReusltId")
     Map<String, Object> selectMaterialSteelIdByReusltId(@RequestBody(required = false) Map<String, Object> map);
 
-    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId", method = RequestMethod.POST)
     RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,
                                                    @RequestParam Integer pageSize);
 
-    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList",method = RequestMethod.POST)
-    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false)Map<String, Object> mapValue,
+    @RequestMapping(value = "/api/v1/wms/wmspivboundmakeresult/getIvboundMakeResultList", method = RequestMethod.POST)
+    RESTfulResult getIvboundMakeResultList(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
@@ -613,27 +676,74 @@ public interface WMSFeign {
 
     //下发给行车工
     @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
-    Map<String,Object> IssueToCrane(@RequestBody Map<String, Object> map);
+    Map<String, Object> IssueToCrane(@RequestBody Map<String, Object> map);
+
     //创建组
-    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/createGrop",produces  = "application/json;charset=UTF-8")
+    @PostMapping(value = "/api/v1/wms/wmspinboundgroups/createGrop", produces = "application/json;charset=UTF-8")
     public RESTfulResult createGrop(@RequestBody Map mapValue);
+
     //
     @PostMapping("/api/v1/wms/inboundScanResult/insertResult")
     public RESTfulResult insertScanResult(@RequestBody(required = false) Map<String, Object> map) throws ParseException;
+
     //新增入库实绩
     @PostMapping("/api/v1/wms/inboundResult/insertInboundResult")
-    public  RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList);
+    public RESTfulResult addInvoice(@RequestParam("userName") String userName, @RequestParam("groupId") BigDecimal groupId, @RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList);
+
     //加入分组
-    @PostMapping(value ="/api/v1/wms/wmspinboundgroups/joinGroup",produces  = "application/json;charset=UTF-8")
+    @PostMapping(value = "/api/v1/wms/wmspinboundgroups/joinGroup", produces = "application/json;charset=UTF-8")
     public RESTfulResult joinGroup(@RequestBody Map mapValue);
+
     //获得抢单信息
     @PostMapping("/api/v1/wms/wmspinbounddistributes/grabDistribute")
-    public  RESTfulResult grabDistribute( @RequestBody Map<String,Object> mapValue);
+    public RESTfulResult grabDistribute(@RequestBody Map<String, Object> mapValue);
+
     //抢单
     @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
+
     public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
     //收发存定时器
     @PostMapping("/api/v1/wms/sendReceive/addSendReceive")
     public RESTfulResult addSendReceive();
-}
 
+
+    @PostMapping(value = "/api/v1/wms/wmspgridmaterials/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestParam("warehouseid") String warehouseid,
+                                            @RequestParam("stackingId") BigDecimal stackingId,
+                                            @RequestParam("gradtionNumber") BigDecimal gradtionNumber,
+                                            @RequestParam(name = "pageNum") Integer pageNum,
+                                            @RequestParam(name = "pageSize") Integer pageSize,
+                                            @RequestParam("apiId") Integer apiId);
+
+    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
+    Map<String, Object> createRestackMakeResult(@RequestParam("keeperId") BigDecimal keeperId,
+                                                @RequestParam("beforeLevel") BigDecimal beforeLevel,
+                                                @RequestParam(name = "afterStackingId", defaultValue = "20") BigDecimal afterStackingId,
+                                                @RequestParam("afterWarehouseId") BigDecimal afterWarehouseId,
+                                                @RequestParam("afterBeforeStackingId") BigDecimal afterBeforeStackingId,
+                                                @RequestParam("resultRemark")String resultRemark,
+                                                @RequestBody(required = false) List<Map<String,Object>> mps);
+
+    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
+    Map<String, Object> selectRestackByWarehouseIds(@RequestParam(name="warehouseid") String warehouseid);
+
+    @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);
+
+}

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:

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.162:8012}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -25,7 +25,6 @@ eureka:
 genxml:
   pth: com/a
 cache:
-
   level: 2
 redis:
   host: 10.10.50.28

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -144,6 +144,7 @@
         FROM (
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
+                        RC.CARRIER_ID         "carrierId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"
@@ -158,8 +159,7 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
             <if test="con != null">
-                where "capacityNumber" like #{con} or "carrierName" like #{con} or
-                "remark" like #{con}
+                and instr(RC.INSERT_UPDATE_REMARK,#{con}) > 0
             </if>
         )
         <where>