呼叫空箱,逻辑修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -35,9 +35,9 @@ import com.neotel.smfcore.custom.lizhen.innerBox.bean.StorageExport;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
 import com.neotel.smfcore.custom.lizhen.innerBox.util.StorageExportUtil;
 import com.neotel.smfcore.custom.lizhen.third.maicheng.api.MaiZhengApi;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.DisableBarcodeUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -983,8 +983,12 @@ public class LiteOrderCache {
                         e.printStackTrace();
                         log.info(subCode.getBarcode()+"为禁用料,库位为:"+subCode.getPosName());
                         disablePosNameList.add(subCode.getPosName());
+                        continue;
                     }
 
+                    if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){
+                        disablePosNameList.add(subCode.getPosName());
+                    }
                 }
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/bean/request/InvForbid.java

+package com.neotel.smfcore.custom.luxsan.factory_c.common.bean.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InvForbid {
+
+    private String plant_code;
+
+    private String action;
+
+    private List<String> reel_list;
+}

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/bean/result/WcsResult.java

 package com.neotel.smfcore.custom.luxsan.factory_c.common.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class WcsResult {
 
     @JsonProperty("MSGTY")

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/controller/LuxsanApiController.java

@@ -4,7 +4,6 @@ package com.neotel.smfcore.custom.luxsan.factory_c.common.controller;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.*;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.*;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/controller/WcsController.java

@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.utils.HttpHelper;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.bean.request.InvForbid;
 import com.neotel.smfcore.custom.luxsan.factory_c.common.bean.request.SendTicketInfo;
 import com.neotel.smfcore.custom.luxsan.factory_c.common.bean.result.WcsResult;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.DisableBarcodeUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,6 +38,25 @@ public class WcsController {
         return  wcsResult;
     }
 
+
+    @ApiOperation("禁用发送自动仓")
+    @RequestMapping("/invForbid")
+    @AnonymousAccess
+    public WcsResult invForbid(@RequestBody InvForbid invForbid) {
+        String action = invForbid.getAction();
+        String plantCode = invForbid.getPlant_code();
+        List<String> reelList = invForbid.getReel_list();
+        String msg = "F".equals(action) ? "禁用" : "解禁";
+        log.info("收到禁用发送到自动仓,动作为:" + msg + ",厂区为:" + plantCode + ",料卷信息为:" + JSON.toJSONString(reelList));
+        if ("F".equals(action)) {
+            DisableBarcodeUtil.updateDisableBarcode(reelList);
+        } else {
+            DisableBarcodeUtil.removeDisableBarcode(reelList);
+        }
+        return new WcsResult("S", "接收成功");
+    }
+
+
     @ApiOperation("砍单通知自动仓")
     @RequestMapping("/cancelOdn")
     @AnonymousAccess

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/util/CacheNameUtil.java → src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/util/CacheNameUtil.java

-package com.neotel.smfcore.custom.luxsan.factory_c.util;
+package com.neotel.smfcore.custom.luxsan.factory_c.common.util;
 
 public class CacheNameUtil {
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/util/CommonUtil.java → src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/util/CommonUtil.java

-package com.neotel.smfcore.custom.luxsan.factory_c.util;
+package com.neotel.smfcore.custom.luxsan.factory_c.common.util;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/util/DisableBarcodeUtil.java

+package com.neotel.smfcore.custom.luxsan.factory_c.common.util;
+
+import com.neotel.smfcore.core.device.util.DataCache;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class DisableBarcodeUtil {
+
+    private static DataCache dataCache;
+
+    @Autowired
+    private void setDataCache(DataCache cache) {
+        DisableBarcodeUtil.dataCache = cache;
+    }
+
+    public static final String DISABLE_BARCODE = "DISABLE_BARCODE";
+
+
+    public static synchronized void updateDisableBarcode(List<String> barcodeList) {
+        Map<String, String> cacheMap = dataCache.getCache(DISABLE_BARCODE);
+        if (cacheMap == null) {
+            cacheMap = new HashMap<>();
+        }
+        for (String barcodeStr : barcodeList) {
+            cacheMap.put(barcodeStr, barcodeStr);
+        }
+        dataCache.updateCache(DISABLE_BARCODE, cacheMap);
+    }
+
+
+    public static synchronized void removeDisableBarcode(List<String> barcodeList) {
+        Map<String, String> cacheMap = dataCache.getCache(DISABLE_BARCODE);
+        if (cacheMap == null) {
+            cacheMap = new HashMap<>();
+        }
+        for (String barcodeStr : barcodeList) {
+            cacheMap.remove(barcodeStr);
+        }
+        dataCache.updateCache(DISABLE_BARCODE, cacheMap);
+    }
+
+
+    public static boolean isDisable(String barcodeStr) {
+        Map<String, String> cacheMap = dataCache.getCache(DISABLE_BARCODE);
+        if (cacheMap == null) {
+            cacheMap = new HashMap<>();
+        }
+        return cacheMap.containsKey(barcodeStr);
+    }
+
+}

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -36,8 +36,8 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckTy
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.MaterialUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java

@@ -15,13 +15,11 @@ import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.CtuTask;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
-import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -145,11 +143,15 @@ public class CtuDeviceController {
         //3.判断是出库,还是入库任务
         if (task.isPutInTask()) {
             task.setStatus(statusStr);
+            if (OP_STATUS.EXECUTING.name().equals(statusStr) || OP_STATUS.WAIT.name().equals(statusStr)){
+                taskService.updateQueueTask(task);
+            } else {
+                taskService.moveTaskToFinished(task);
+                taskService.updateFinishedTask(task);
+            }
             if (OP_STATUS.FINISHED.name().equals(statusStr)) {
                 BoxHandleUtil.intoPos(task);
                 ReelLockPosUtil.removeReelLockPosInfo(task.getBarcode());
-            } else {
-                taskService.updateQueueTask(task);
             }
         } else {
             if (!OP_STATUS.FINISHED.name().equals(statusStr)) {
@@ -163,6 +165,7 @@ public class CtuDeviceController {
             //出库任务不让完成,等待入库的时候,再完成
             else if (!OP_STATUS.FINISHED.name().equals(statusStr)) {
                 if (!task.isOutFromPos()) {
+                    taskService.moveTaskToFinished(task);
                     BoxHandleUtil.outFromPos(task);
                     task.setOutFromPos(true);
                 }
@@ -186,7 +189,7 @@ public class CtuDeviceController {
         for (DataLog dataLog : allTasks) {
             if (dataLog.isCheckOutTask() && !dataLog.isFinished() && !dataLog.isCancel()) {
                 if (boxStr.startsWith(dataLog.getBarcode())) {
-                    return ResultBean.newOkResult(dataLog.getPosName());
+                    return ResultBean.newOkResult(dataLog.getLoc());
                 }
             }
         }
@@ -224,6 +227,7 @@ public class CtuDeviceController {
             if (dataLog.isExecuting() || dataLog.isWait()){
                 taskService.updateQueueTask(dataLog);
             } else {
+                taskService.moveTaskToFinished(dataLog);
                 taskService.updateFinishedTask(dataLog);
             }
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/GrPutInController.java

@@ -18,10 +18,8 @@ import com.neotel.smfcore.custom.luxsan.api.enums.QueryGrStatusEnum;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.BindGrInfo;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.QueryGrDto;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.QueryGrStatusDto;
-import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BinCacheUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.BoxHandleUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/ManualPutInController.java

@@ -2,7 +2,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller;
 
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/PkCheckOutController.java

 package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller;
 
-import cn.hutool.core.date.DateUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
-import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.enums.LITEORDER_SOURCE;
@@ -12,7 +10,6 @@ import com.neotel.smfcore.core.order.rest.bean.mapstruct.OrderMapper;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
-import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.GetPickingItemsRequest;
@@ -23,11 +20,9 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.GetPickingIte
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.QueryPickingDto;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.CheckOutUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
-import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/StorTransferController.java

@@ -11,7 +11,7 @@ import com.neotel.smfcore.custom.luxsan.api.bean.request.BrandQtyRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.BrandQtyResult;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.StorTransfer;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.MaterialUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,10 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 @Api(tags = "W2 1F储位移转")
 @Slf4j

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/TicketController.java

 package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
-import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -25,15 +22,14 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.TicketTransfer;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.FetchMoveTicketDto;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.LiteorderCheckType;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util.MaterialUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BinCacheUtil.java

 package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util;
 
 import com.alibaba.fastjson.JSON;
-import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
-import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
-import com.neotel.smfcore.custom.lizhen.agvBox.util.BoxUtil;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.QueryBinRequest;
-import com.neotel.smfcore.custom.luxsan.api.bean.request.UpdateBinRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.QueryBinResult;
 import com.neotel.smfcore.custom.luxsan.api.enums.BinEnum;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.ValidBin;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.enums.TaskCurrentLoc;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
-import lombok.Data;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java

@@ -174,6 +174,8 @@ public class BoxHandleUtil {
                 Criteria criteria = Criteria.where("barcode.subCodeList.posName").regex(Pattern.compile(QueryHelp.escapeExprSpecialWord("-0" + needBinCodeStr), Pattern.CASE_INSENSITIVE));
                 criteriaList.add(criteria);
             }
+            criteriaList.add(Criteria.where("barcode.subCodeList").isNull());
+            criteriaList.add(Criteria.where("barcode.subCodeList").size(0));
             c.orOperator(criteriaList);
         }
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/MaterialUtil.java

 package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.util;
 
-import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.BindGrInfo;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.StorTransfer;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.TicketReturn;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.TicketTransfer;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
 import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
 import java.util.Map;
 
 @Component

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

@@ -14,9 +14,8 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.PalletUpdateRequest;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.WipBoxHandleUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

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

@@ -10,8 +10,8 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.ShipCancelUpshelfRequest;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;

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

@@ -26,8 +26,7 @@ import com.neotel.smfcore.custom.luxsan.api.bean.request.ValidCartonRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.FetchPalletInfoResult;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.ValidCartonResult;
 import com.neotel.smfcore.custom.luxsan.api.enums.PalletEnum;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.ManualWorkUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util.TaskLocUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;

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

@@ -7,7 +7,7 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -11,7 +11,7 @@ import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.FetchMoveTicketRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.FetchMoveTicketResult;
 import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto.FetchMoveTicketDto;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -7,31 +7,25 @@ import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
-import com.neotel.smfcore.core.device.enums.OP;
-import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
-import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.FetchShipmentInfoRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.result.FetchShipmentInfoResult;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CommonUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.bean.OdnOut;
 import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.bean.dto.FetchShipmentInfoDto;
-import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +33,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Api(tags = "半成品出库")
 @Slf4j

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/util/ManualWorkUtil.java

 package com.neotel.smfcore.custom.luxsan.factory_c.wipstor.util;
 
 import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.custom.luxsan.factory_c.util.CacheNameUtil;
+import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CacheNameUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;