过期日期没有时增加判断。api103日志文本错误。

src/main/java/com/neotel/smfcore/core/barcode/bean/BarcodeRule.java

@@ -932,6 +932,11 @@ public class BarcodeRule {
 
         rule="PN[1:0:-1]|MPN[2:0:-1]|BATCH[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|EXPDATEMM-dd-yyyy[2:0:-1]|PRODATEyyyyMMdd[2:0:-1]|QITEM[1:0:-1]|Q1ITEM[2:0:-1]|P20ITEM[3:0:-1]|MSL[1:0:-1]4LITEM[-1:0:-1]";
         codeStr="=1+0x0-310x80=P550-502922C|1P3217-10-01-C|1T132456C3|7Q1000|SP2UATPCB015|21PSIMMTECH|2D08-13-2024||Q100|1Q10||7E2";
+
+
+        rule="";
+        codeStr="PMT29F2T08EMLEEJ4-QK:E|1PMT29F2T08EMLEEJ4-QK:E|1THZ001WZ.QT|7Q1000+EA|SHZ001WZ.QT|21PMICRON||9DD20250901||||7E3|";
+
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         if(b != null){

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

@@ -866,7 +866,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         }
         barcode = MicronApi.API001(operationId,rfid, barcode);
         if (barcode == null) {
-            throw new ValidateException("smfcore.error.barcode.invalid", "未找到有效的条码");
+            throw new ApiException("smfcore.api.fail", "{0} Failed to get data", new String[]{"API001 " });
         }
         //判断是否忽略去Xray
 

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

@@ -95,7 +95,9 @@ public class AMaterialBean {
         resultMap.put("mfgLotNum", mfgLotNum);
         resultMap.put("mfgName", mfgName);
         resultMap.put("qty", qty);
-        resultMap.put("expirationDate", DateTimeFormatter.ISO_DATE_TIME.format(expirationDate));
+        if(expirationDate!=null){
+            resultMap.put("expirationDate", DateTimeFormatter.ISO_DATE_TIME.format(expirationDate));
+        }
 
         resultMap.put("msLevel", msLevel);
         resultMap.put("containerType", containerType);//类型

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

@@ -196,7 +196,10 @@ public class MicronApi  {
                 if (ObjectUtil.isEmpty(errmsg)) {
                     errmsg = errorMsg;
                 }
-                Integer error = result.getErrorValue("error");
+                String error = result.getErrorValue("error");
+                if(error==null){
+                    error="";
+                }
 //                String message=result.getErrorValue("message");
 //                loadingUtil.AddErrorItem(rfid, barcode,error,errmsg);
                 if (ObjectUtil.isNotEmpty(errmsg)) {
@@ -1097,7 +1100,7 @@ public class MicronApi  {
     public static ResultBean Api103( String packagingSlip,String purchaseOrder, String operationId) {
         String url = config.getUrl(config.api_name_103);
         url = MessageFormat.format(url, purchaseOrder, packagingSlip, operationId);
-        return Api100("API102",url);
+        return Api100("API103",url);
     }
 
     public static String Api201(String linePrepOrderId, String operationId) {

src/main/java/com/neotel/smfcore/custom/micron1053/loading/util/LoadingUtil.java

@@ -608,7 +608,13 @@ public class LoadingUtil {
                 PushToMes(rfid, inList, posList);
             }
         }
-        return getInlist();
+
+        inList.setManualFinish(true);
+        inList.setStatus(INLIST_STATUS.OK);
+        inList = inListManager.save(inList);
+        inListCache.addInListToMap(inList);
+        log.info("finish 入库单[" + inList.getName() + "] 手动结束，设置 manualFinish=true, 状态改为 OK");
+        return inList;
     }
 
 }