Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/AMScontroller.java
#	src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

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

@@ -153,8 +153,27 @@ public class AMScontroller {
         return amsFeign.purchasePlanAdd(map);
     }
 
-    @ApiOperation(value = "同步销售订单")
-    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+@ApiOperation(value = "采购计划修改接口", notes = "采购计划修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanUpdate")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanUpdate(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanUpdate(map);
+    }
+
+    @ApiOperation(value = "采购计划修改状态接口", notes = "采购计划修改状态接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchasePlanChange")
+    @LogAround(foreignKeys = {"transPlanId"},foreignKeyTypes = {"采购计划"})
+    public Map<String, Object> purchasePlanChange(@RequestBody(required = false) Map<String ,Object> map) {
+        return amsFeign.purchasePlanChange(map);
+    }
+
+    @ApiOperation(value="同步销售订单")    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @PostMapping(value = "/saleOrderSync")
     @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"销售订单"})
     public Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map) {

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.annotaion.LogAround;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -22,6 +23,45 @@ import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/wms")
 public class WMSController extends BaseRESTfulController {
-   
+
+    @Autowired
+    WMSFeign wmsFeign;
+
+    @ApiOperation(value="查询", notes = "分页查询销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params", value = "查询条件", required = false, dataType = "HashMap"),
+            @ApiImplicitParam(name = "apiId", value = "表单ID", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/selectSaleOrderPage")
+    public Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) HashMap parmas,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.selectSaleOrderPage(parmas == null ? new HashMap<>() : parmas, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "新增销售订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = false, dataType = "Map<String, Object>")
+    @PostMapping("/add")
+    public RESTfulResult addet(@RequestBody(required = false) HashMap params) {
+        return wmsFeign.addet(params);
+    }
+
+    @ApiOperation(value="查询", notes = "分页查询发货单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params", value = "查询条件", required = false, dataType = "HashMap"),
+            @ApiImplicitParam(name = "apiId", value = "表单ID", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @PostMapping(value = "/selectDlivDirNo")
+    public Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap parmas,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize) {
+        return wmsFeign.selectDlivDirNo(parmas == null ? new HashMap<>() : parmas, apiId, pageNum, pageSize);
+    }
 }
 

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

@@ -60,6 +60,12 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanAdd")
     Map<String, Object> purchasePlanAdd(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanUpdate")
+    Map<String, Object> purchasePlanUpdate(Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchasePlanChange")
+    Map<String, Object> purchasePlanChange(Map<String, Object> map);
+
     @PostMapping("api/v1/ams/amsorders/saleOrderSync")
     Map<String, Object> saleOrderSync(@RequestBody(required = false) Map<String, Object> map);
 

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

@@ -1,11 +1,13 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,931 +17,19 @@ import java.util.Map;
  */
 @FeignClient(value = "ANTAI-WMS-API",url = "${openfeign.WMSFeign.url}")
 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 Integer warehouseId,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime);
+    @PostMapping("api/v1/wms/wmsslmdlivdirs/selectSaleOrderPage")
+    Map<String, Object> selectSaleOrderPage(@RequestBody(required = false) HashMap parmas,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
 
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResultStatistics", method = RequestMethod.POST)
-    Map<String, Object> getWmsInboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer warehouseId,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime);
-    /**
-     * 展示真实入库实绩
-     */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsInboundResults", method = RequestMethod.POST)
-    Map<String, Object> getWmsInboundResults(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer warehouseId,
-                                            @RequestParam String startTime,
-                                            @RequestParam String endTime);
-
-
-    /**
-     * 展示预留入库实绩信息
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value = "/api/v1/wms/inboundResult/getWmsReservedResult", method = RequestMethod.POST)
-    Map<String, Object> getWmsReservedResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer warehouseId,
-                                            @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 Integer warehouseId,
-                                              @RequestParam String  startTime,
-                                              @RequestParam String  endTime);
-
-    /**
-     * 新增出库实绩
-     *
-     * @param mapval
-     * @return
-     */
-    @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);
-
-    /**
-     * 新增出库扫描实绩
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertwmspOutboundScanResult")
-    Map<String, Object> insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
-
-    /**
-     * 复制新增出库扫描
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/copyWmspOutboundScanResult")
-    Map<String, Object> copyWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
-
-    /**
-     * 删除出库扫描
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundscanresults/deleteWmspOutboundScanResult")
-    Map<String, Object> deleteWmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map);
-
-    /**
-     * 装卸工PDA前端点击出库
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping("/api/v1/wms/wmspoutboundresults/outbountResultToSuccess")
-    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);
-
-    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/getRmsMaterial")
-    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 warehouseId,
-                                               @RequestParam String time,
-                                               @RequestParam String con);
-
-    /**
-     * 展示实时库存数据
-     *
-     * @param
-     * @param
-     * @param
-     * @return
-     */
-    @RequestMapping(value = "/api/v1/wms/wmspgridmaterials/getGridMaterialAgeList", method = RequestMethod.POST)
-    Map<String, Object> getGridMaterialAgeList(@RequestBody(required = false) Map<String, Object> map,
-                                               @RequestParam Integer warehouseId);
-
-    /**
-     * 通过成品仓库网格ID查询实时库存数据
-     *
-     * @param gridId
-     * @return
-     */
-    @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);
-
-    /**
-     * 钢材异地库出库扫描
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsoffsitelibaryoutbounds/OutScanResultTag")
-    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);
-
-    /**
-     * 展示钢材异地库入库实绩表
-     *
-     * @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);
-
-    /**
-     * 钢材异地库入库扫描新增异地库入库实绩
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsoffsitelibraryinbounds/insertOffsiteLibraryInbound")
-    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);
-
-
-    /**
-     * 新增倒库出库实绩
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmspoutboundresults/insertOutBoundResult")
-    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);
-
-    /**
-     * 通过下拉框筛选数据
-     *
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @param warehouseid
-     * @param gradtionNumber
-     * @param stackingId
-     * @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
-    );
-
-    /**
-     * 添加倒垛单实绩
-     *
-     * @param mapval
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/addRestackMakeResult")
-    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 String resultId);
-
-    /**
-     * 下发倒垛单pc端
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/dispatchDistrubtionStatus/{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);
-
-    /**
-     * 下拉框获取垛位
-     *
-     * @param warehouseid
-     * @return
-     */
-    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectStackingId")
-    Map<String, Object> selectStackingId(@RequestParam Integer warehouseid);
-
-    /**
-     * 下拉框获取仓库名称
-     *
-     * @return
-     */
-    @GetMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectWarehouse")
-    Map<String, Object> selectWarehouse();
-
-    /**
-     * 展示倒垛单
-     *
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @param DistrubtionStatus
-     * @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
-    );
-
-    @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);
-
-    /**
-     * 渲染倒垛后的仓库信息
-     *
-     * @param resultId
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectAfterWarehouseByResultId/{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);
-
-    /**
-     * PDA展示倒垛单
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackForPDA")
-    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,
-                                                  @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);
-
-    /**
-     * PDA根据仓库id查找倒垛单
-     *
-     * @param map
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseId")
-    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/inboundScanResult/getScanResult")
-    Map<String, Object> getScanResult(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping(value = "/api/v1/wms/inboundResult/getFurnaceNoAmount")
-    Map<String, Object> getFurnaceNoAmount(@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);
-
-    /**
-     * 展示退库实绩
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @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,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam String con);
-
-
-    @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);
-
-    //根据仓库id查询未接收的垛位
-    @PostMapping("/api/v1/wms/inboundScanResult/selectStackingInfoByWarehouseId")
-    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);
-
-    /**
-     * 展示倒库实绩
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @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)
-    RESTfulResult getWmsIvboundMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer apiId,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize);
-
-    /**
-     * 库存盘点实绩
-     */
-    @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,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam String con);
-
-
-    /**
-     * 库存结转
-     *
-     * @param mapValue
-     * @param apiId
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @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,
-                                    @RequestParam Integer pageSize,
-                                    @RequestParam String value);
-
-    //库存结转定时器
-    @PostMapping(value = "/api/v1/wms/inventoryClose/addInventoryClose")
-    RESTfulResult addInventoryClose();
-
-    /**
-     * 收发存报表
-     */
-    @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,
-                                 @RequestParam Integer pageSize,
-                                 @RequestParam String con,
-                                 @RequestParam String startTime,
-                                 @RequestParam String endTime
-                                 );
-
-    /**
-     * 展示未下发吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @PostMapping(value = "/api/v1/wms/inboundScanResult/getTagResult")
-    Map<String, Object> getTagResult();
-
-    /**
-     * 展示已入库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @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();
-
-    /**
-     * 展示退库已下发吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @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();
-
-    /**
-     * 展示已倒库入库吊钢工扫描吊牌实绩
-     *
-     * @return
-     */
-    @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();
-
-    /**
-     * 新增入库实绩，返回选择垛位
-     *
-     * @param mapList
-     * @return
-     */
-    @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)
-    String insertReboundResult(@RequestBody List<Map<String, Object>> mapList);
-
-    /**
-     * 新增倒库入库实绩，返回选择垛位
-     *
-     * @param mapList
-     * @return
-     */
-    @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);
-
-
-    /**
-     * 新增库存盘点
-     *
-     * @param map
-     * @return
-     */
-    @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);
-
-
-    /**
-     * 新增退库扫描实绩
-     *
-     * @param map
-     * @return
-     */
-    @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);
-
-    /**
-     * 根据实绩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)
-    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,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId,
-                                           @RequestParam String con);
-
-    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/addIvboundMakeResult")
-    Map<String, Object> addIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
-
-    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/deleteIvboundMakeResult/{resultId}")
-    Map<String, Object> deleteIvboundMakeResult(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/selectIvboundMakeResult/{resultId}")
-    List<Map<String, Object>> selectIvboundMakeResult(@PathVariable("resultId") Integer resultId);
-
-    @PostMapping(value = "/api/v1/wms/wmspivboundmakeresult/updateIvboundMakeResult")
-    Map<String, Object> updateIvboundMakeResult(@RequestBody Map<String, Object> mapValue);
-
-
-    //下发给行车工
-    @PostMapping("/api/v1/wms/reboundResult/IssueToCrane")
-    Map<String, Object> IssueToCrane(@RequestBody Map<String, Object> map);
-
-    //创建组
-    @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);
-
-    //加入分组
-    @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);
-
-    //抢单
-    @GetMapping("/api/v1/wms/wmspinbounddistributes/getNewDistribute")
-
-    public  RESTfulResult getNewDistribute( @RequestParam("personnelWorkshopid") Integer personnelWorkshopid);
-
-
-//
-//    @PostMapping("/api/v1/wms/wmsprestackmakeresults/createRestackMakeResult")
-//    public  RESTfulResult 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("/api/v1/wms/wmsprestackmakeresults/selectRestackByWarehouseIds")
-    public  Map<String, Object> selectRestackByWarehouseIds(@RequestParam(required = true) String warehouseid);
-    @GetMapping("/api/v1/wms/wmsprestackmaketyperesults/getRestackMakeTypeResult")
-    public Map<String, Object> getRestackMakeTypeResult(@RequestParam("restackMake") String restackMake,@RequestParam("context")String context);
-
-    @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("/api/v1/wms/wmspoutboundresults/getInitOutboundScanResultMaterialInfo")
-    public RESTfulResult getInitOutboundScanResultMaterialInfo(@RequestParam(value = "resultId",required = true) BigDecimal resultId);
-    @PostMapping("/api/v1/wms/wmspoutboundresults/deleteGridMaterial")
-    public RESTfulResult deleteGridMaterial(@RequestParam String materialOnlyCode);
-
-
-
-    @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/insertReserved")
-    Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
-                                      @RequestParam(value = "materialCode") String materialCode,
-                                      @RequestParam(value = "materialSpecification") String materialSpecification,
-                                      @RequestParam(value = "materialModel") String materialModel,
-                                      @RequestParam(value = "quantity") Integer quantity,
-                                      @RequestParam(value = "actuallyWeight") String actuallyWeight,
-                                      @RequestParam(value = "materialTheWeight") String materialTheWeight,
-                                      @RequestParam(value = "remark") String remark);
-
-    @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
-    Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
-                                      @RequestParam(value = "materialCode") String materialCode,
-                                      @RequestParam(value = "materialSpecification") String materialSpecification,
-                                      @RequestParam(value = "materialModel") String materialModel,
-                                      @RequestParam(value = "quantity") Integer quantity);
-
-    @PostMapping("/api/v1/wms/wmspgridmaterials/getStockTakingList")
-    Map<String,Object> getStockTakingList(@RequestParam(value = "pageNum") Integer pageNum,
-                                          @RequestParam(value = "pageSize") Integer pageSize,
-                                          @RequestParam(value = "apiId") Integer apiId);
-    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialList")
-    Map<String,Object> getSteelMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                            @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam Integer apiId,
-                                            @RequestParam Integer warehouseId,
-                                            @RequestParam String con);
-    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelWarehouseList")
-    Map<String,Object> getSteelWarehouseList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                             @RequestParam Integer apiId,
-                                             @RequestParam Integer pageNum,
-                                            @RequestParam Integer pageSize,
-                                            @RequestParam String con);
-
-    @PostMapping("/api/v1/wms/wmspgridmaterials/getSteelMaterialModelList")
-    Map<String,Object> getSteelMaterialModelList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam(value = "pageNum") Integer pageNum,
-                                                @RequestParam(value = "pageSize") Integer pageSize,
-                                                @RequestParam(value = "apiId") Integer apiId,
-                                                 @RequestParam(value = "warehouseId") Integer warehouseId,
-                                                 @RequestParam(value = "status") Integer status,
-                                                 @RequestParam(value = "startTime",required = false)String startTime,
-                                                 @RequestParam(value = "endTime",required = false)String endTime,
-                                                 @RequestParam(value = "con") String con);
-
-
-    @PostMapping("/api/v1/wms/inboundResult/changeReserved")
-    int changeReserved(@RequestBody(required = false) List<Map<String, Object>> mapList);
-
-    //出库炉号对应的数量
-    @PostMapping("/api/v1/wms/wmspoutboundresults/getWmsOutboundResultStatistics")
-    RESTfulResult getWmsOutboundResultStatistics(@RequestBody(required = false) Map<String, Object> mapValue,
-                                 @RequestParam Integer apiId,
-                                 @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize,
-                                 @RequestParam Integer warehouseId,
-                                 @RequestParam String con,
-                                 @RequestParam String startTime,
-                                 @RequestParam String endTime);
-
-    @PostMapping("/api/v1/wms/inboundResult/undoInbound")
-    Map<String, Object> undoInbound(@RequestParam BigDecimal inboundId);
-
-    @PostMapping("/api/v1/wms/wmspoutboundresults/disorderlyOutbound")
-    Map<String, Object> disorderlyOutbound(@RequestBody Map<String, Object> map);
-
-    @PostMapping("/api/v1/wms/wmshgridmaterials/gePortStockList")
-    Map<String, Object> gePortStockList(@RequestBody(required = false) Map<String, Object> mapVal);
-
-    @PostMapping("/api/v1/wms/platformWarehouse/platformInbound")
-    Map<String, Object> platformInbound(@RequestBody Map<String, Object> map);
-
-    @PostMapping("/api/v1/wms/platformWarehouse/afterInwardOutbound")
-    Map<String, Object> afterInwardOutbound(@RequestBody(required = false) Map<String, Object> map);
-
-    @PostMapping("/api/v1/wms/wmspgridmaterials/getTheoreticalByInfo")
-    Map<String, Object> getTheoreticalByInfo(@RequestParam String warehouseId,
-                                             @RequestParam String materialCode,
-                                             @RequestParam String materialSpecification,
-                                             @RequestParam String materialModel,
-                                             @RequestParam Integer status,
-                                             @RequestParam Integer num);
-
-    @PostMapping("/api/v1/wms/inboundEas/getInboundEasInfo")
-    Map<String, Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer apiId,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer warehouseId,
-                                          @RequestParam String startTime,
-                                          @RequestParam String endTime);
-
-    @PostMapping("/api/v1/wms/inboundEas/reduceInboundEas")
-    Map<String, Object> reduceInboundEas(@RequestParam Integer inboundEasId);
-
-    @PostMapping("/api/v1/wms/platformWarehouse/listAfterInwardOutbound")
-    Map<String, Object> listAfterInwardOutbound(@RequestBody List<Map<String, Object>> mapList);
-
-
-    @PostMapping("/api/v1/wms/wmspgridmaterials/deleteInboundMaterial")
-    Map<String, Object> deleteInboundMaterial(@RequestParam("warehouseId") String warehouseId,
-                                              @RequestParam("materialCode") String materialCode,
-                                              @RequestParam("materialSpecification") String materialSpecification,
-                                              @RequestParam("materialModel") String materialModel,
-                                              @RequestParam("quantity") Integer quantity);
-
-    @PostMapping("/api/v1/wms/inboundScanResult/recordScanResult")
-    Map<String, Object> recordScanResult(@RequestBody Map<String, Object> map);
+    @PostMapping("api/v1/wms/wmsslmdlivdirs/add")
+    RESTfulResult addet(@RequestBody HashMap params);
 
+    @PostMapping(value = "api/v1/wms/wmsslmdlivdirs/selectDlivDirNo")
+    public Map<String, Object> selectDlivDirNo(@RequestBody(required = false) HashMap params,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize);
 }

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

@@ -108,8 +108,7 @@
         RC.COMPANY_ID "value",
         RC.COMPANY_NAME "label"
         from RMS_COMPANY RC
-        where DELETED = 0
-        )
+        where DELETED = 0        )
         <where>
             <if test="companyType!=null and companyType!=''">
                 AND "companyType" = #{companyType}