NL料架：出库任务与料架不一致时增加提示。

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

@@ -313,7 +313,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
             }
         } else {
             //先判断库存中有没有此条码
-            ResultBean resultBean = outProcess(code,sourceId, loginUser,request);
+            ResultBean resultBean = outProcess(storageId,code,sourceId, loginUser,request);
             if(resultBean != null){
                 return resultBean;
             }
@@ -325,7 +325,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
         return ResultBean.newOkResult("");
     }
 
-    private ResultBean outProcess(String code, String sourceId, String loginUser,HttpServletRequest request){
+    private ResultBean outProcess(String storageId,String code, String sourceId, String loginUser,HttpServletRequest request){
         String barcodeStr = "=1x1=" + code;
         Barcode barcode = codeResolve.resolveOneValideBarcode(barcodeStr);
         StoragePos inPos = storagePosManager.getByBarcode(barcode.getBarcode());
@@ -341,6 +341,12 @@ public class NLShelfHandler extends BaseDeviceHandler {
                             return ResultBean.newErrorResult(1, "smfcore.shelf.error.orderError", "任务与指定工单[{0}]不一致", new String[]{sourceId});
                         }
                     }
+                    //是否是同一个料架
+                    if(!task.getStorageId().equals(storageId)){
+                        Storage storage=dataCache.getStorageById(storageId);
+                        return ResultBean.newErrorResult(1, "smfcore.shelf.error.storageError", "任务与指定料架[{0}]不一致", new String[]{storage.getName()});
+                    }
+
                     taskService.addTaskToFinished(inPos, null, loginUser);
                     opPosLight("close", inPos, "");
                     log.info(code + " 出库完成, 库位[" + inPos.getPosName() + "]灭灯");

src/main/resources/messages.properties

@@ -339,6 +339,8 @@ smfcore.selfAudit.notExist=\u672A\u627E\u5230\u6279\u6B21\u53F7[{0}]\u7684\u76D8
 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.shelf.error.orderError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u5DE5\u5355[{0}]\u4E0D\u4E00\u81F4
+smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
 #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

@@ -337,4 +337,6 @@ smfcore.selfAudit.noStorage=Please select the equipment to be self audit
 smfcore.selfAudit.notExist= [{0}] self audit information not found
 smfcore.selfAudit.hasEnd=[{0}] self audit is complete
 smfcore.selfAudit.notFind=self audit is not found
-smfcore.selfAudit.pause=self audit {0} has Paused
\ No newline at end of file
+smfcore.selfAudit.pause=self audit {0} has Paused
+smfcore.shelf.error.orderError=Task does not match the assigned work order [{0}]
+smfcore.shelf.error.storageError=Task does not match the specified shelf [{0}]
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -334,4 +334,6 @@ smfcore.selfAudit.noStorage=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u5316\u3059\u30
 smfcore.selfAudit.notExist=\u30ED\u30C3\u30C8\u756A\u53F7[{0}]\u306E\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u60C5\u5831\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcore.selfAudit.hasEnd=[{0}]\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC\u5B8C\u6210
 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
\ No newline at end of file
+smfcore.selfAudit.pause=\u30BB\u30EB\u30D5\u30C6\u30B9\u30C8{0}\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3057\u305F
+smfcore.shelf.error.orderError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u5DE5\u5355[{0}]\u4E0D\u4E00\u81F4
+smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -334,4 +334,6 @@ smfcore.selfAudit.noStorage=\u8BF7\u9009\u62E9\u8981\u76D8\u70B9\u7684\u8BBE\u59
 smfcore.selfAudit.notExist=\u672A\u627E\u5230\u6279\u6B21\u53F7[{0}]\u7684\u76D8\u70B9\u4FE1\u606F
 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
\ No newline at end of file
+smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
+smfcore.shelf.error.orderError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u5DE5\u5355[{0}]\u4E0D\u4E00\u81F4
+smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -335,4 +335,6 @@ smfcore.selfAudit.noStorage=\u8ACB\u9078\u64C7\u8981\u76E4\u9EDE\u7684\u8A2D\u50
 smfcore.selfAudit.notExist=\u672A\u627E\u5230\u6279\u6B21\u865F[{0}]\u7684\u76E4\u9EDE\u4FE1\u606F
 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
\ No newline at end of file
+smfcore.selfAudit.pause=\u76E4\u9EDE{0}\u5DF2\u66AB\u505C
+smfcore.shelf.error.orderError=\u4EFB\u52D9\u8207\u6307\u5B9A\u5DE5\u55AE[{0}]\u4E0D\u4E00\u81F4
+smfcore.shelf.error.storageError=\u4EFB\u52D9\u8207\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
\ No newline at end of file