fix:odn砍单回库新增获取、删除缓存列表接口

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -236,8 +236,9 @@ public class DataInitManager {
         addNewFunctionMenu(5, wip, "transferInventory", "311转库", "transferInventory", "SemiFinishProducts/transferInventory/index", "transferInventory", functionMenuMap);
         addNewFunctionMenu(5, wip, "transferInventory", "311转库", "transferInventory", "SemiFinishProducts/transferInventory/index", "transferInventory", functionMenuMap);
 
 
         addNewFunctionMenu(6, wip, "ngMaterial", "NG料出箱", "ngMaterial", "SemiFinishProducts/ngMaterial/index", "ngMaterial", functionMenuMap);
         addNewFunctionMenu(6, wip, "ngMaterial", "NG料出箱", "ngMaterial", "SemiFinishProducts/ngMaterial/index", "ngMaterial", functionMenuMap);
-        addNewFunctionMenu(6, wip, "handMovementOut", "手动出箱", "handMovementOut", "SemiFinishProducts/handMovement/out/index", "handMovementOut", functionMenuMap);
-        addNewFunctionMenu(6, wip, "handMovementIn", "手动入箱", "handMovementIn", "SemiFinishProducts/handMovement/in/index", "handMovementIn", functionMenuMap);
+        addNewFunctionMenu(7, wip, "handMovementOut", "手动出箱", "handMovementOut", "SemiFinishProducts/handMovement/out/index", "handMovementOut", functionMenuMap);
+        addNewFunctionMenu(8, wip, "handMovementIn", "手动入箱", "handMovementIn", "SemiFinishProducts/handMovement/in/index", "handMovementIn", functionMenuMap);
+        addNewFunctionMenu(9, wip, "cutOrders", "回单砍库", "cutOrders", "SemiFinishProducts/cutOrders/index", "cutOrders", functionMenuMap);
 
 
 
 
         //MSD管理：MSD库存.MSD追溯性.MSD设置
         //MSD管理：MSD库存.MSD追溯性.MSD设置

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/CancelRestockController.java

@@ -111,29 +111,28 @@ public class CancelRestockController {
     }
     }
 
 
 
 
-    @ApiOperation("获取砍单回库的料箱信息")
-    @RequestMapping("/boxInfo")
+    @ApiOperation("删除砍单回库缓存")
+    @RequestMapping("/delete")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean boxInfo() {
+    public ResultBean deleteCache(String boxStr) {
         Map<String, String> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF);
         Map<String, String> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF);
-        if (cacheMap == null) {
-            cacheMap = new HashMap<>();
+        if (cacheMap == null || !cacheMap.containsKey(boxStr)) {
+            throw new ValidateException("smfcore.valueNotFind", "未找到{0}", new String[]{boxStr});
         }
         }
-        return ResultBean.newOkResult(cacheMap.values());
+        cacheMap.remove(boxStr);
+        dataCache.updateCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF,cacheMap);
+        return ResultBean.newOkResult("ok");
     }
     }
 
 
-
-    @ApiOperation("移除砍单回库的料箱信息")
-    @RequestMapping("/removeBoxInfo")
+    @ApiOperation("获取回库缓列表")
+    @RequestMapping("/list")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean removeBoxInfo(String boxStr) {
+    public ResultBean list() {
         Map<String, String> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF);
         Map<String, String> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF);
         if (cacheMap == null) {
         if (cacheMap == null) {
             cacheMap = new HashMap<>();
             cacheMap = new HashMap<>();
         }
         }
-        cacheMap.remove(boxStr);
-        dataCache.updateCache(CacheNameUtil.CHCHE_SHIPCANCELUPSHELF,cacheMap);
-        return ResultBean.newOkResult("");
+        return ResultBean.newOkResult(cacheMap.keySet());
     }
     }
 
 
 }
 }