盘点BUG修改

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java

@@ -104,7 +104,8 @@ public class SelfAuditDeviceController {
             }
             }
         }
         }
         //根据CID获取盘点的下一个库位
         //根据CID获取盘点的下一个库位
-        return ResultBean.newOkResult("ok");
+        return ResultBean.newErrorResult(101, "smfcore.selfAudit.noPos", "盘点{0}未找到库位号", new String[]{selfAudit.getBatchNo()});
+
     }
     }
     @ApiOperation("盘点： 库位已出库完成 ")
     @ApiOperation("盘点： 库位已出库完成 ")
     @PostMapping(value = "/posOutEnd")
     @PostMapping(value = "/posOutEnd")
@@ -188,6 +189,7 @@ public class SelfAuditDeviceController {
         for (SelfAuditItem item :
         for (SelfAuditItem item :
                 items) {
                 items) {
             if (item.getPosName().equals(posName)) {
             if (item.getPosName().equals(posName)) {
+                findOk=true;
                 log.info(" 盘点[" + selfAudit.getBatchNo() + "]库位入库完成：posName[" + item.getPosName() + "]barcode[" + item.getBarcode() + "]，actualBarcode=[" + actualBarcode + "]");
                 log.info(" 盘点[" + selfAudit.getBatchNo() + "]库位入库完成：posName[" + item.getPosName() + "]barcode[" + item.getBarcode() + "]，actualBarcode=[" + actualBarcode + "]");
 
 
                 StoragePos storagePos = storagePosManager.getByPosName(posName);
                 StoragePos storagePos = storagePosManager.getByPosName(posName);

src/main/resources/messages.properties

@@ -339,6 +339,7 @@ smfcore.selfAudit.hasEnd=[{0}]\u76D8\u70B9\u5DF2\u5B8C\u6210
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
 smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
+smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #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.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -338,4 +338,5 @@ smfcore.selfAudit.notExist= [{0}] self audit information not found
 smfcore.selfAudit.hasEnd=[{0}] self audit is complete
 smfcore.selfAudit.hasEnd=[{0}] self audit is complete
 smfcore.selfAudit.notFind=self audit is not found
 smfcore.selfAudit.notFind=self audit is not found
 smfcore.selfAudit.pause=self audit {0} has Paused
 smfcore.selfAudit.pause=self audit {0} has Paused
-smfcore.updatePass.hasNoAccess=No operating rights
\ No newline at end of file
+smfcore.updatePass.hasNoAccess=No operating rights
+smfcore.selfAudit.noPos=Self Audit{0}No depot number found
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -335,4 +335,5 @@ smfcore.selfAudit.notExist=\u30ED\u30C3\u30C8\u756A\u53F7[{0}]\u306E\u30A4\u30F3
 smfcore.selfAudit.hasEnd=[{0}]\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC\u5B8C\u6210
 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.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.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
\ No newline at end of file
+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

src/main/resources/messages_zh_CN.properties

@@ -335,4 +335,5 @@ smfcore.selfAudit.notExist=\u672A\u627E\u5230\u6279\u6B21\u53F7[{0}]\u7684\u76D8
 smfcore.selfAudit.hasEnd=[{0}]\u76D8\u70B9\u5DF2\u5B8C\u6210
 smfcore.selfAudit.hasEnd=[{0}]\u76D8\u70B9\u5DF2\u5B8C\u6210
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76D8\u70B9\u4FE1\u606F
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
 smfcore.selfAudit.pause=\u76D8\u70B9{0}\u5DF2\u6682\u505C
-smfcore.updatePass.hasNoAccess=\u6CA1\u6709\u64CD\u4F5C\u6743\u9650
\ No newline at end of file
+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

src/main/resources/messages_zh_TW.properties

@@ -336,4 +336,5 @@ smfcore.selfAudit.notExist=\u672A\u627E\u5230\u6279\u6B21\u865F[{0}]\u7684\u76E4
 smfcore.selfAudit.hasEnd=[{0}]\u76E4\u9EDE\u5DF2\u5B8C\u6210
 smfcore.selfAudit.hasEnd=[{0}]\u76E4\u9EDE\u5DF2\u5B8C\u6210
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76E4\u9EDE\u4FE1\u606F
 smfcore.selfAudit.notFind=\u672A\u627E\u5230\u76E4\u9EDE\u4FE1\u606F
 smfcore.selfAudit.pause=\u76E4\u9EDE{0}\u5DF2\u66AB\u505C
 smfcore.selfAudit.pause=\u76E4\u9EDE{0}\u5DF2\u66AB\u505C
-smfcore.updatePass.hasNoAccess=\u6C92\u6709\u64CD\u4F5C\u6B0A\u9650
\ No newline at end of file
+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