入库任务不能直接更新为FINISHED。

src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java

@@ -147,7 +147,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
             for (DataLog queueTask : queueTasks) {
                 if (queueTask.getCid().equals(cid)) {
                     //有入库任务不分配出库任务
-                    if (queueTask.isPutInTask()) {
+                    if (queueTask.isPutInTask()&&(!queueTask.isFinished())&&(!queueTask.isCancel())) {
                         return statusBean;
                     } else {
                         if (queueTask.isExecuting()) {
@@ -577,14 +577,21 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         }
 
         if (opTask.isFinished()) {
-            log.info(" taskId[" + taskId + "],料盘[" + barcode + "]更新位置指令[" + statusStr + "]=" + locInfo + ",失败：任务已完成");
+            log.error(" taskId[" + taskId + "],料盘[" + barcode + "]更新位置指令[" + statusStr + "]=" + locInfo + ",失败：任务已完成");
             return ResultBean.newErrorResult(302, "smfcore.task.hasEnd", "任务已完成");
         }
 
         if (opTask.isCancel()) {
+            log.error(" taskId[" + taskId + "],料盘[" + barcode + "]更新位置指令[" + statusStr + "]=" + locInfo + ",失败：任务已被取消");
             return ResultBean.newErrorResult(303, "smfcore.task.hasCancel", "更新状态时{0}的任务[{1}]已被取消", new String[]{opTask.getBarcode(), opTask.getId()});
         }
 
+        //如果是入库任务，不能直接更新为 FINISHED
+        if(statusStr.toUpperCase().equals("FINISHED")&&opTask.isPutInTask()){
+            log.error(" taskId[" + taskId + "],料盘[" + barcode + "]当前状态[" + opTask.getStatus() + "=" + opTask.getLocInfo() + "]更新位置指令[" + statusStr + "]=" + locInfo + ",失败：入库任务不能直接更新为结束");
+            return ResultBean.newErrorResult(304, "smfcore.task.updatePutInFail", "入库任务{0}[{1}]不能更新为{2}", new String[]{opTask.getBarcode(), opTask.getId(),statusStr});
+
+        }
         statusStr = statusStr.toUpperCase();
         String inouType = opTask.isCheckOutTask() ? "出库" : "入库";
         //若已经在此状态，不需要再更新

src/main/java/com/neotel/smfcore/core/device/handler/impl/ThirdBoxHandler.java

@@ -126,7 +126,7 @@ public class ThirdBoxHandler extends BaseDeviceHandler{
             for (DataLog queueTask : queueTasks) {
                 if (queueTask.getCid().equals(cid)) {
                     //有入库任务不分配出库任务
-                    if (queueTask.isPutInTask()) {
+                    if (queueTask.isPutInTask()&&(!queueTask.isFinished())&&(!queueTask.isCancel())) {
                         return statusBean;
                     } else {
                         if (queueTask.isExecuting()) {

src/main/resources/messages.properties

@@ -340,6 +340,7 @@ smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
+smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -339,4 +339,5 @@ smfcore.selfAudit.hasEnd=[{0}] self audit is complete
 smfcore.selfAudit.notFind=self audit is not found
 smfcore.selfAudit.pause=self audit {0} has Paused
 smfcore.updatePass.hasNoAccess=No operating rights
-smfcore.selfAudit.noPos=Self Audit{0}No depot number found
\ No newline at end of file
+smfcore.selfAudit.noPos=Self Audit{0}No depot number found
+smfcore.task.updatePutInFail=Cannot update the status of the inbound task {0}[{1}] to {2}
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -336,4 +336,5 @@ smfcore.selfAudit.hasEnd=[{0}]\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC\u5B8C\u
 smfcore.selfAudit.notFind=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u60C5\u5831\u304C\u898B\u3064\u304B\u3089\u306A\u3044 
 smfcore.selfAudit.pause=\u30BB\u30EB\u30D5\u30C6\u30B9\u30C8{0}\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3057\u305F
 smfcore.updatePass.hasNoAccess=\u64CD\u4F5C\u6A29\u306A\u3057
-smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
\ No newline at end of file
+smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
+smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -336,4 +336,5 @@ smfcore.selfAudit.hasEnd=[{0}]\u76D8\u70B9\u5DF2\u5B8C\u6210
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
-smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
\ No newline at end of file
+smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
+smfcore.task.updatePutInFail=\u5165\u5E93\u4EFB\u52A1{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72B6\u6001\u4E3A{2}
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -337,4 +337,5 @@ smfcore.selfAudit.hasEnd=[{0}]\u76E4\u9EDE\u5DF2\u5B8C\u6210
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76E4\u9EDE\u4FE1\u606F
 smfcore.selfAudit.pause=\u76E4\u9EDE{0}\u5DF2\u66AB\u505C
 smfcore.updatePass.hasNoAccess=\u6C92\u6709\u64CD\u4F5C\u6B0A\u9650
-smfcore.selfAudit.noPos=\u76E4\u9EDE{0}\u672A\u627E\u5230\u5EAB\u4F4D\u865F
\ No newline at end of file
+smfcore.selfAudit.noPos=\u76E4\u9EDE{0}\u672A\u627E\u5230\u5EAB\u4F4D\u865F
+smfcore.task.updatePutInFail=\u5165\u5EAB\u4EFB\u52D9{0}[{1}]\u4E0D\u80FD\u66F4\u65B0\u72C0\u614B\u70BA{2}
\ No newline at end of file