1.过期时间修改

2.提示信息修改

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

@@ -507,12 +507,12 @@ public class Micron20031Api {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
 
 
-        Object expiredDateObj = resultMap.get("expiredDate");
+        /*Object expiredDateObj = resultMap.get("expiredDate");
         if (expiredDateObj != null) {
         if (expiredDateObj != null) {
             Date expiredDate = DateUtil.toDate(expiredDateObj.toString(), "MM-dd-yyyy");
             Date expiredDate = DateUtil.toDate(expiredDateObj.toString(), "MM-dd-yyyy");
             log.info("重新设置镁光的过期时间为:" + expiredDate);
             log.info("重新设置镁光的过期时间为:" + expiredDate);
             barcode.setExpireDate(expiredDate);
             barcode.setExpireDate(expiredDate);
-        }
+        }*/
         return barcode;
         return barcode;
     }
     }
 
 

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

@@ -61,7 +61,7 @@ public class MicronSpApiListener extends BaseSmfApiListener {
                             if (barcode.getPartNumber().equals(inListItem.getPN()) && barcode.getBatch().equals(inListItem.getBatch())) {
                             if (barcode.getPartNumber().equals(inListItem.getPN()) && barcode.getBatch().equals(inListItem.getBatch())) {
                                 hasBarcode = true;
                                 hasBarcode = true;
                                 if (inListItem.getInNum() >= inListItem.getNum()) {
                                 if (inListItem.getInNum() >= inListItem.getNum()) {
-                                    throw new ValidateException("smfcore.inlist.pnItemOk", "The material [{1}] of the incoming order [{0}] has been entered into the warehouse", new String[]{inList.getName(), inListItem.getPN()+"_"+inListItem.getBatch()});
+                                        throw new ValidateException("smfcore.inlist.pnItemOk", "The material [{1}] of the incoming order [{0}] has completed deposit", new String[]{inListItem.getPN()+"_"+inListItem.getBatch(),inList.getName()});
                                 }
                                 }
                             }
                             }
                         }
                         }

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

@@ -123,7 +123,7 @@ public class MicronSpUnloadController {
                     log.info("unload/getMicronPN [" + pn + "] barcode [" + pos.getBarcode().getBarcode() + "] 标记为NG");
                     log.info("unload/getMicronPN [" + pn + "] barcode [" + pos.getBarcode().getBarcode() + "] 标记为NG");
                 }
                 }
             }
             }
-            return ResultBean.newErrorResult(-1, "smfcore.micron.checkoutByPnFail", "未找到可出库物料");
+            return ResultBean.newErrorResult(-1, "smfcore.micron.checkoutByPnFail", "Material PN[{0}] not found for dispatch",new String[]{pn});
         } catch (ApiException e) {
         } catch (ApiException e) {
             return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());
             return ResultBean.newErrorResult(1, e.getMessage(), e.getMessage());
         }
         }

src/main/resources/messages.properties

@@ -260,7 +260,7 @@ smfcore.error.getMaterialLot.out=\u6761\u7801[{0}]\u9A8C\u8BC1\u5931\u8D25\uFF0C
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8 
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8 
 smfcore.agv=AGV
 smfcore.agv=AGV
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u8D25
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u8D25
-smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7269\u6599
+smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230PN[{0}]\u53EF\u51FA\u5E93\u7269\u6599
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.order.exception=\u5F02\u5E38
 smfcore.order.exception=\u5F02\u5E38

src/main/resources/messages_en_US.properties

@@ -175,7 +175,7 @@ smfcore.materialBox.qtyError=Please enter the correct quantity
 smfcore.inlist.notFound=Entry slip not found [{0}]
 smfcore.inlist.notFound=Entry slip not found [{0}]
 smfcore.inlist.listOk=Inbound orders [{0}] completed
 smfcore.inlist.listOk=Inbound orders [{0}] completed
 smfcore.inlist.setOk=Setup successful
 smfcore.inlist.setOk=Setup successful
-smfcore.inlist.pnItemOk=The material [{1}] of the incoming order [{0}] has been entered into the warehouse
+smfcore.inlist.pnItemOk=The material [{1}] of the incoming order [{0}] has completed deposit
 smfcore.inlist.noPn=Inbound order [{0}] has no material [{1}] inbound requirement
 smfcore.inlist.noPn=Inbound order [{0}] has no material [{1}] inbound requirement
 smfcore.storagePos.barcode=MA.ID
 smfcore.storagePos.barcode=MA.ID
 smfcore.storagePos.partNumber=PN
 smfcore.storagePos.partNumber=PN
@@ -258,7 +258,7 @@ smfcore.error.virtualOut.noItem=The corresponding material is not found in work
 smfcore.spKanban=Equipment Overview
 smfcore.spKanban=Equipment Overview
 smfcore.agv=AGV
 smfcore.agv=AGV
 smfcore.micron.operationFailure=Operation failed
 smfcore.micron.operationFailure=Operation failed
-smfcore.micron.checkoutByPnFail=Material not found for dispatch
+smfcore.micron.checkoutByPnFail=Material PN[{0}] not found for dispatch
 smfcore.order.uploadFailure=Upload failed
 smfcore.order.uploadFailure=Upload failed
 smfcore.error.storage.outNotEnd= {0}There are outgoing tasks not yet completed, not allowed to be warehoused
 smfcore.error.storage.outNotEnd= {0}There are outgoing tasks not yet completed, not allowed to be warehoused
 smfcore.order.exception=Exceptions
 smfcore.order.exception=Exceptions

src/main/resources/messages_ja_JP.properties

@@ -256,7 +256,7 @@ smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5
 smfcore.spKanban=\u6A5F\u5668\u6982\u8981
 smfcore.spKanban=\u6A5F\u5668\u6982\u8981
 smfcore.agv=AGV
 smfcore.agv=AGV
 smfcore.micron.operationFailure=\u64CD\u4F5C\u306B\u5931\u6557\u3057\u305F
 smfcore.micron.operationFailure=\u64CD\u4F5C\u306B\u5931\u6557\u3057\u305F
-smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7269\u6599
+smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230PN[{0}]\u53EF\u51FA\u5E93\u7269\u6599
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.error.storage.outNotEnd= {0} \u672A\u5B8C\u4E86\u306E\u9001\u4FE1\u30BF\u30B9\u30AF\u304C\u3042\u308A\u3001\u30B9\u30C8\u30C3\u30AF\u3092\u8A31\u53EF\u3057\u306A\u3044
 smfcore.error.storage.outNotEnd= {0} \u672A\u5B8C\u4E86\u306E\u9001\u4FE1\u30BF\u30B9\u30AF\u304C\u3042\u308A\u3001\u30B9\u30C8\u30C3\u30AF\u3092\u8A31\u53EF\u3057\u306A\u3044
 smfcore.order.exception=\u4F8B\u5916\u4E8B\u9805
 smfcore.order.exception=\u4F8B\u5916\u4E8B\u9805

src/main/resources/messages_zh_CN.properties

@@ -256,7 +256,7 @@ smfcore.error.virtualOut.noItem=\u5DE5\u5355{0}\u4E2D\u672A\u627E\u5230\u5BF9\u5
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.agv=AGV
 smfcore.agv=AGV
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u8D25
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u8D25
-smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230\u53EF\u51FA\u5E93\u7269\u6599
+smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230PN[{0}]\u53EF\u51FA\u5E93\u7269\u6599
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.error.storage.outNotEnd=\u6599\u4ED3{0}\u6709\u51FA\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8BB8\u5165\u5E93
 smfcore.order.exception=\u5F02\u5E38
 smfcore.order.exception=\u5F02\u5E38

src/main/resources/messages_zh_TW.properties

@@ -257,7 +257,7 @@ smfcore.error.virtualOut.noItem=\u5DE5\u55AE{0}\u4E2D\u672A\u627E\u5230\u5C0D\u6
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.spKanban=\u8BBE\u5907\u6982\u89C8
 smfcore.agv=AGV
 smfcore.agv=AGV
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u6557
 smfcore.micron.operationFailure=\u64CD\u4F5C\u5931\u6557
-smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230\u53EF\u51FA\u5EAB\u7269\u6599
+smfcore.micron.checkoutByPnFail=\u672A\u627E\u5230PN[{0}]\u53EF\u51FA\u5EAB\u7269\u6599
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.order.uploadFailure=\u4E0A\u4F20\u5931\u8D25
 smfcore.error.storage.outNotEnd=\u6599\u5009{0}\u6709\u51FA\u5EAB\u4EFB\u52D9\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8A31\u5165\u5EAB
 smfcore.error.storage.outNotEnd=\u6599\u5009{0}\u6709\u51FA\u5EAB\u4EFB\u52D9\u672A\u5B8C\u6210\uFF0C\u4E0D\u5141\u8A31\u5165\u5EAB
 smfcore.order.exception=\u7570\u5E38
 smfcore.order.exception=\u7570\u5E38