盘点bug修改

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

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

src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpController.java

@@ -51,10 +51,10 @@ public class MicronSpController {
             Integer num = Convert.toInt(posName.substring(2, posName.length()));
 
             Integer used = 0;
-            if (pos.isUsed()) {
+            if (pos.isUsed()&&pos.getBarcode()!=null) {
                 used = 1;
-                boolean AuthoriseNg= pos.getBarcode().getAppendData("AuthoriseNg") ;
-                if(AuthoriseNg){
+                Boolean AuthoriseNg= pos.getBarcode().getAppendData("AuthoriseNg") ;
+                if(AuthoriseNg!=null && AuthoriseNg){
                     used=2;
                 }
             }

src/main/resources/messages.properties

@@ -341,6 +341,7 @@ 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
+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.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.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
+smfcore.shelf.error.storageError=Task does not match the specified shelf [{0}]
+smfcore.selfAudit.noPos=Self Audit{0}No depot number found
\ 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.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
+smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
+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

@@ -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.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
+smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
+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

@@ -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.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
+smfcore.shelf.error.storageError=\u4EFB\u52D9\u8207\u6307\u5B9A\u6599\u67B6[{0}]\u4E0D\u4E00\u81F4
+smfcore.selfAudit.noPos=\u76E4\u9EDE{0}\u672A\u627E\u5230\u5EAB\u4F4D\u865F
\ No newline at end of file