1.取消任务,找不到登录修改

2.获取目的地,找到多个有效条码提示

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

@@ -662,6 +662,7 @@ public class LiteOrderCache {
                             if (pos == null) {
                                 break;
                             }
+                            boolean disable = false;
                             try {
                                 excludePosIds.add(pos.getId());
 
@@ -729,12 +730,16 @@ public class LiteOrderCache {
 
                                 List<String> batchCheckReel = lizhenApi.batchCheckReel(Arrays.asList(pos.getBarcode()), "",model);
                                 if (batchCheckReel != null && !batchCheckReel.isEmpty()){
+                                    disable = true;
                                     throw new ValidateException("",pos.getBarcode().getBarcode()+"被禁用,库位为:"+pos.getPosName());
                                 }
                             } catch (ValidateException e) {
                                 pos = null;
                                 log.error("工单号:" + orderNo + " " + e.getMessage());
                             }
+                            if (disable){
+                                break;
+                            }
                         } while (pos == null);
                     }
                     if (pos == null) {

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -352,7 +352,7 @@ public class TaskService {
         storagePos.setMsg("任务取消,屏蔽库位");
         storagePosManager.save(storagePos);
         log.info("任务取消,屏蔽库位:库位号[" + storagePos.getId() + "][" + storagePos.getPosName() + "]barcode[" + barcode + "]");
-        DeviceMessageUtil.addEnabledPosMessage(storagePos, SecurityUtils.getCurrentUsername());
+        DeviceMessageUtil.addEnabledPosMessage(storagePos, SecurityUtils.getLoginUsername());
     }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/InnerBoxRestController.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.lizhen.innerBox.rest;
 
 import com.alibaba.fastjson.JSON;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
@@ -248,13 +249,24 @@ public class InnerBoxRestController {
     @AnonymousAccess
     public Map<String, Object> getLineByBarcode(@RequestBody Map<String, String> paramMap) {
         Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("code",0);
         String barcode = paramMap.get("barcode");
         log.info(barcode + "获取目的地信息");
-        CodeBean codeBean = codeResolve.resolveSingleCode(barcode);
-        if (codeBean.getBarcode() != null) {
+        Barcode reBarcode = null;
+        try {
+            reBarcode = codeResolve.resolveOneValideBarcode(barcode);
+        } catch (ValidateException e) {
+            log.error("获取目的地失败:",e);
+            resultMap.put("code",99);
+            resultMap.put("msg",e.getMessage());
+            return resultMap;
+        }
+
+
+        if (reBarcode != null) {
             List<DataLog> allTasks = taskService.getAllTasks();
             for (DataLog dataLog : allTasks) {
-                if (dataLog.isCheckOutTask() && dataLog.getBarcode().equals(codeBean.getBarcode().getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()) {
+                if (dataLog.isCheckOutTask() && dataLog.getBarcode().equals(reBarcode.getBarcode()) && !dataLog.isFinished() && !dataLog.isCancel()) {
                     resultMap.put("cid", dataLog.getCid());
                     resultMap.put("export", "");
                     //如果sourceName和subSourceId都不为空时,则返回目标位置
@@ -280,13 +292,13 @@ public class InnerBoxRestController {
                         resultMap.put("export", export);
                     }
 
-                    resultMap.put("height", codeBean.getBarcode().getHeight());
-                    resultMap.put("plateSize", codeBean.getBarcode().getPlateSize());
-                    resultMap.put("barcode", codeBean.getBarcode().getBarcode());
+                    resultMap.put("height", reBarcode.getHeight());
+                    resultMap.put("plateSize", reBarcode.getPlateSize());
+                    resultMap.put("barcode", reBarcode.getBarcode());
 
                     //判断料盘放到B/T面
                     resultMap.put("side", "B");
-                    if (codeBean.getBarcode().getPlateSize() > 7) {
+                    if (reBarcode.getPlateSize() > 7) {
                         resultMap.put("side", "T");
                     } else {
                         if ("T".equals(dataLog.getSide())) {