1053:料仓状态修改。条码解析时增加MPN重设

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -202,9 +202,9 @@ public class MenuInit {
         addDefaultFunctionMenu(111, pMenuUser,"用户管理", "peoples", "system/user/index", "peoples",DEFAULT_SHOW_MENU);
         addDefaultFunctionMenu(112, pMenuUser,"角色管理", "role", "system/role/index", "role",DEFAULT_SHOW_MENU);
         //条形码:条码管理,条码设置
-        Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAuditM",null);
-        addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
-        addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
+//        Menu selfAudit = Menu.CreatePMenu("盘点管理", 12, "selfAuditManagerment", "selfAuditM",null);
+//        addDefaultFunctionMenu(121,selfAudit, "盘点", "selfAudit", "system/selfAudit/index","selfAudit");
+//        addDefaultFunctionMenu(122, selfAudit, "盘点记录","selfAuditLog", "system/selfAuditLog/index", "selfAuditLog");
 
         Menu helpAbout = Menu.CreatePMenu("帮助", 9999, "help", "help",null);
         addDefaultFunctionMenu(99991, helpAbout, "说明书", "instruction", "system/instruction/index","aboutBook");

src/main/java/com/neotel/smfcore/core/barcode/utils/CodeResolve.java

@@ -96,7 +96,7 @@ public class CodeResolve {
                     if((codeBeanFromRule.getBarcode()!=null)&&(codeBeanFromRule.getBarcode().getPartNumber()!=null)) {
                         if (!barcode.getPartNumber().equals(codeBeanFromRule.getBarcode().getPartNumber())) {
                             try {
-                                log.warn("[" + barcode.getPartNumber() + "]重新设置PN[" + barcode.getPartNumber() + "]为[" + codeBeanFromRule.getBarcode().getPartNumber() + "]");
+                                log.warn("[" + barcode.getBarcode() + "]重新设置PN[" + barcode.getPartNumber() + "]为[" + codeBeanFromRule.getBarcode().getPartNumber() + "]");
                                 barcode.setPartNumber(codeBeanFromRule.getBarcode().getPartNumber());
                                 barcode = barcodeManager.save(barcode);
                             } catch (Exception ve) {
@@ -107,7 +107,18 @@ public class CodeResolve {
                 }catch (Exception ex){
                     log.error("条码["+codeStr+"]重置PN出错："+ ex.getMessage());
                 }
-
+                try{
+                    if((codeBeanFromRule.getBarcode()!=null)&&(codeBeanFromRule.getBarcode().getMpn()!=null)) {
+                        String mpn = codeBeanFromRule.getBarcode().getMpn();
+                        if (!barcode.getMpn().equals(mpn)) {
+                            log.warn("[" + barcode.getBarcode() + "]重新设置MPN[" + barcode.getMpn() + "]为[" + mpn + "]");
+                            barcode.setMpn(mpn);
+                            barcode = barcodeManager.save(barcode);
+                        }
+                    }
+                }catch (Exception ex){
+                    log.error("条码["+codeStr+"]重置MPN出错："+ ex.getMessage());
+                }
 
                 boolean setSize=false;
                 Component component = componentManager.findByPartNumberAndProvider(barcode.getPartNumber(),barcode.getProvider());

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

@@ -34,7 +34,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @Api(tags = "盘点功能，设备端调用")
-@RequestMapping("/rest/selfAudit")
+@RequestMapping("/rest/device/selfAudit")
 public class SelfAuditDeviceController {
     @Autowired
     private DataCache dataCache;

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronStatusController.java

@@ -203,11 +203,14 @@ public class MicronStatusController {
                 if(s.getStatus()==6||s.getStatus()==7||s.getStatus()==9||s.getStatus()==10||s.getStatus()==11 ){
                     dto.setStatus(3);
                 }
-                if (s.getStatus() == 2||s.getStatus()==3) {
+                if (s.getStatus() == 2||s.getStatus()==3||s.getStatus()==4) {
                     dto.setStatus(2);
                 }
+                if(s.getStatus()==0){
+                    dto.setStatus(0);
+                }
                 //如果状态还是0，需要改为1
-               else if(dto.getStatus()==0){
+               else   if(dto.getStatus()==0) {
                     dto.setStatus(1);
                 }
                 Map<String,String> msgMap=s.getMsgMap();

src/main/resources/messages.properties

@@ -330,6 +330,14 @@ smfcore.queryPos.cannotFind=cannot find posName [{0}]
 smfcore.queryPos.posIsEmpty=[{0}] is empty
 smfcore.queryPos.cannotFindBarcode=cannot find barcode [{0}] In storage
 smfcore.storage.notAvailable=\u6599\u4ED3{0}\u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5\u51FA\u5E93
+smfcore.selfAuditManagerment=\u76D8\u70B9
+smfcore.selfAudit=\u76D8\u70B9
+smfcore.selfAuditLog=\u76D8\u70B9\u8BB0\u5F55
+smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76D8\u70B9{0}\u8FD8\u672A\u5B8C\u6210
+smfcore.selfAudit.noStorage=\u8BF7\u9009\u62E9\u8981\u76D8\u70B9\u7684\u8BBE\u5907
+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
 #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

@@ -329,3 +329,11 @@ smfcore.queryPos.cannotFind=cannot find posName [{0}]
 smfcore.queryPos.posIsEmpty=[{0}] is empty
 smfcore.queryPos.cannotFindBarcode=cannot find barcode [{0}] In storage
 smfcore.storage.notAvailable=SMD BOX{0} Offline or Not Avaliable, Can Not Retrieve. 
+smfcore.selfAuditManagerment=Self Audit
+smfcore.selfAudit=Self Audit
+smfcore.selfAuditLog=Self Audit Records
+smfcore.selfAudit.preNotEnd=The last self audit {0} is still incomplete
+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
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -326,3 +326,11 @@ smfcore.queryPos.cannotFind=cannot find posName [{0}]
 smfcore.queryPos.posIsEmpty=[{0}] is empty
 smfcore.queryPos.cannotFindBarcode=cannot find barcode [{0}] In storage 
 smfcore.storage.notAvailable=\u6599\u4ED3{0}\u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5\u51FA\u5E93
+smfcore.selfAuditManagerment=\u30C6\u30A4\u30AF\u30B9\u30C8\u30C3\u30AF
+smfcore.selfAudit=\u30C6\u30A4\u30AF\u30B9\u30C8\u30C3\u30AF
+smfcore.selfAuditLog=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u30FC\u30EC\u30B3\u30FC\u30C9
+smfcore.selfAudit.preNotEnd=\u6700\u5F8C\u306E\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA{0}\u306F\u672A\u5B8C\u6210
+smfcore.selfAudit.noStorage=\u30A4\u30F3\u30D9\u30F3\u30C8\u30EA\u5316\u3059\u308B\u6A5F\u5668\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
+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

src/main/resources/messages_zh_CN.properties

@@ -326,3 +326,11 @@ smfcore.queryPos.cannotFind=cannot find posName [{0}]
 smfcore.queryPos.posIsEmpty=[{0}] is empty
 smfcore.queryPos.cannotFindBarcode=cannot find barcode [{0}] In storage 
 smfcore.storage.notAvailable=\u6599\u4ED3{0}\u4E0D\u53EF\u7528\uFF0C\u65E0\u6CD5\u51FA\u5E93
+smfcore.selfAuditManagerment=\u76D8\u70B9
+smfcore.selfAudit=\u76D8\u70B9
+smfcore.selfAuditLog=\u76D8\u70B9\u8BB0\u5F55
+smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76D8\u70B9{0}\u8FD8\u672A\u5B8C\u6210
+smfcore.selfAudit.noStorage=\u8BF7\u9009\u62E9\u8981\u76D8\u70B9\u7684\u8BBE\u5907
+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
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -327,3 +327,11 @@ smfcore.queryPos.cannotFind=cannot find posName [{0}]
 smfcore.queryPos.posIsEmpty=[{0}] is empty
 smfcore.queryPos.cannotFindBarcode=cannot find barcode [{0}] In storage 
 smfcore.storage.notAvailable=\u6599\u5009{0}\u96E2\u7DDA\u6216\u4E0D\u53EF\u7528\uFF0C\u7121\u6CD5\u51FA\u5EAB
+smfcore.selfAuditManagerment=\u76E4\u9EDE
+smfcore.selfAudit=\u76E4\u9EDE
+smfcore.selfAuditLog=\u76E4\u9EDE\u8A18\u9304
+smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76E4\u9EDE{0}\u9084\u672A\u5B8C\u6210
+smfcore.selfAudit.noStorage=\u8ACB\u9078\u64C7\u8981\u76E4\u9EDE\u7684\u8A2D\u5099
+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
\ No newline at end of file