1.msLevel修改。

2.api001 接口bug修改

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

@@ -647,37 +647,42 @@ public class RobotBoxHandler extends BaseDeviceHandler {
     }
 
     private Barcode ApiCheck(String rfid,Barcode barcode) throws ApiException {
-        if(ObjectUtil.isEmpty(rfid)){
+        if (ObjectUtil.isEmpty(rfid)) {
             return barcode;
         }
         //是否启用
-        if(!MicronApi.isEnable()) {
+        if (!MicronApi.isEnable()) {
             return barcode;
         }
         barcode.setToXray(false);
         barcode.setInListName("");
-        String operationId="";
-        InList inList=loadingUtil.getInlist();
-        if(inList==null){
+        String operationId = "";
+        InList inList = loadingUtil.getInlist();
+        if (inList == null) {
+            return barcode;
+        }
+        if (!inList.isValidRfid(rfid)) {
             return barcode;
         }
-        if(!inList.isValidRfid(rfid)){
+        operationId = inList.getOperationId();
+        if (ObjectUtil.isEmpty(operationId)) {
+            log.info("条码[" + barcode.getBarcode() + "]获取库位号，operationId 为空，不需要接口验证");
             return barcode;
         }
-        barcode = MicronApi.API001(operationId, barcode );
-        if(barcode==null) {
+        barcode = MicronApi.API001(operationId, barcode);
+        if (barcode == null) {
             throw new ValidateException("smfcore.error.barcode.invalid", "未找到有效的条码");
         }
 
-        if(barcode.isToXray()){
-            log.info("条码[]获取库位号，需要去点料，点料机未连接，直接异常");
-            throw  new ApiException("smfcore.micron.xray.offline","{0}需要点料，点料机不在线",new String[]{barcode.getBarcode()});
+        if (barcode.isToXray()) {
+            log.info("条码[" + barcode.getBarcode() + "]获取库位号，需要去点料，点料机未连接，直接异常");
+            throw new ApiException("smfcore.micron.xray.offline", "{0}需要点料，点料机不在线", new String[]{barcode.getBarcode()});
 //            barcode.setToXray(true);
 //            barcode.setInListName(inList.getName());
-//            loadingUtil.AddInListItem(rfid,barcode,"", INITEM_STATUS.PutIn);
-        }else{
+//            loadingUtil.AddInListItem(rfid,barcode,"", INITEM_STATUS.XRay);
+        } else {
             barcode.setInListName(inList.getName());
-            loadingUtil.AddInListItem(rfid,barcode,"", INITEM_STATUS.XRay);
+            loadingUtil.AddInListItem(rfid, barcode, "", INITEM_STATUS.PutIn);
         }
 
         return barcode;

src/main/java/com/neotel/smfcore/custom/micron1053/api/AMaterialBean.java

@@ -36,6 +36,11 @@ public class AMaterialBean {
         bean.qty=barcode.getAmount();
         bean.expirationDateStr=barcode.getExpireDateStr();
         bean.msLevel=barcode.getMsl();
+        if(bean.msLevel.startsWith("E")){
+            bean.msLevel=bean.msLevel.substring(1);
+        }else if(bean.msLevel.startsWith("7E")){ 
+            bean.msLevel=bean.msLevel.substring(2);
+        }
         String reelType= MicronDataCache.GetReelType(barcode.getPlateSize(),barcode.getHeight());
         bean.containerType=reelType;//类型
         bean.arraySize=barcode.getQ1Item();//1Q
@@ -55,6 +60,7 @@ public class AMaterialBean {
         resultMap.put("mfgName", mfgName);
         resultMap.put("qty", qty);
         resultMap.put("expirationDateStr", expirationDateStr);
+
         resultMap.put("msLevel", msLevel);
         resultMap.put("containerType", containerType);//类型
         resultMap.put("arraySize", arraySize);//1Q

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -521,6 +521,7 @@ public class MicronApi  {
             log.info("调用MES接口 Api011: url=[" + url + "] ");
             MicronResult result = HttpHelper.getMicronJson(url);
             String operationId=result.getResult("operationId");
+            log.info("  Api011  ,mode="+mode+",userName="+userName+", 获取到 operationId="+operationId);
             return operationId;
         } catch (Exception e) {
             log.error(url + "出错", e);

src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java

@@ -220,7 +220,14 @@ public class NeotelController {
                     resultMap.put("mfgName", barcode.getProvider());
                     resultMap.put("qty", barcode.getAmount());
                     resultMap.put("expirationDateStr", barcode.getExpireDateStr());
-                    resultMap.put("msLevel", barcode.getMsl());
+                    String msgLevel=barcode.getMsl();
+
+                    if(msgLevel.startsWith("E")){
+                        msgLevel=msgLevel.substring(1);
+                    }else if(msgLevel.startsWith("7E")){
+                        msgLevel=msgLevel.substring(2);
+                    }
+                    resultMap.put("msLevel", msgLevel);
                     String reelType= MicronDataCache.GetReelType(barcode.getPlateSize(),barcode.getHeight());
                     resultMap.put("containerType", reelType);//类型
                     resultMap.put("arraySize", barcode.getQ1Item());//1Q

src/main/resources/messages.properties

@@ -352,6 +352,7 @@ smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728
 smfcore.micron.xray.offline={0}\u9700\u8981\u70B9\u6599\uFF0C\u70B9\u6599\u673A\u4E0D\u5728\u7EBF 
 smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
 smfcore.api.fail={0} Failed to get data
+smfcore.micron.apiClose=Not yet open  
 #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

@@ -350,4 +350,6 @@ smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.expiration.ameExists=expiration date config[{0}]already exists
 smfcore.expiration.notExist=expiration date config[{0}]does not exist
 smfcore.micron.xray.offline={0}Need to go to the count\uFF0CThe ordering machine is not online. 
-smfcore.micron.nodata=No information found
\ No newline at end of file
+smfcore.micron.nodata=No information found
+smfcore.api.fail={0} Failed to get data
+smfcore.micron.apiClose=Not yet open  
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -347,4 +347,6 @@ smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.expiration.ameExists=\u8FC7\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
 smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
 smfcore.micron.xray.offline={0}\u9700\u8981\u70B9\u6599\uFF0C\u70B9\u6599\u673A\u4E0D\u5728\u7EBF 
-smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
\ No newline at end of file
+smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
+smfcore.api.fail={0} Failed to get data
+smfcore.micron.apiClose=Not yet open  
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -347,4 +347,6 @@ smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.expiration.ameExists=\u8FC7\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
 smfcore.expiration.notExist=\u8FC7\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
 smfcore.micron.xray.offline={0}\u9700\u8981\u70B9\u6599\uFF0C\u70B9\u6599\u673A\u4E0D\u5728\u7EBF 
-smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
\ No newline at end of file
+smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
+smfcore.api.fail={0} \u83B7\u53D6\u6570\u636E\u5931\u8D25
+smfcore.micron.apiClose=API\u529F\u80FD\u672A\u5F00\u653E
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -348,4 +348,6 @@ smfcore.m.emptyOut=No Reel Pickup From Mycronics
 smfcore.expiration.ameExists=\u904E\u671F\u914D\u7F6E[{0}]\u5DF2\u5B58\u5728 
 smfcore.expiration.notExist=\u904E\u671F\u914D\u7F6E[{0}]\u4E0D\u5B58\u5728 
 smfcore.micron.xray.offline={0}\u9700\u8981\u9EDE\u6599\uFF0C\u9EDE\u6599\u6A5F\u4E0D\u5728\u7DDA 
-smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
\ No newline at end of file
+smfcore.micron.nodata=\u672A\u627E\u5230\u4FE1\u606F
+smfcore.api.fail={0} \u83B7\u53D6\u6570\u636E\u5931\u8D25
+smfcore.micron.apiClose=API\u529F\u80FD\u672A\u5F00\u653E
\ No newline at end of file