loading 接口增加phase2B相关参数：MBR,REQ,GR,MCL

src/main/java/com/neotel/smfcore/core/inList/service/po/InList.java

@@ -25,6 +25,15 @@ public class InList extends BasePo implements Serializable {
         setSendEmail(sendEmail);
     }
 
+    public void SetParam(String mode,int shelfNum,String reqId,String mbrId,String deliveryNote,String purchaseOrder,String operationId ){
+        this.setMode(mode);
+        this.setShelfNum(shelfNum);
+        this.setReqId(reqId);
+        this.setMbrId(mbrId);
+        this.setDeliveryNote(deliveryNote);
+        this.setPurchaseOrder(purchaseOrder);
+        this.setOperationId(operationId);
+    }
     /**
      * 入库单名称
      */
@@ -61,6 +70,23 @@ public class InList extends BasePo implements Serializable {
 
     private String operationId="";
 
+    /**
+    * ReqId
+     */
+    private String reqId="";
+    /**
+     * mbrId
+     */
+    private String mbrId="";
+    /**
+     * Delivery Note ( Packaging Slip)（包装单）
+     */
+    private String deliveryNote="";
+    /**
+     *  STO # ( Purchase Order)（采购单号）
+     */
+    private String purchaseOrder ;
+
     public boolean isValidRfid(String rfid){
         if(rfidList.contains(rfid)){
             return  true;

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

@@ -59,32 +59,32 @@ public class LoadingUtil {
         }
         return null;
     }
-    //获取库位号成功，增加一个正在入库的
-    public void AddErrorItem(String rfid, Barcode barcode, Integer error,String message) {
-        InList inList = getInlist();
-
-        if (inList == null) {
-            return;
-        }
-        inList.addRfid(rfid);
-        inList.setStatus(INLIST_STATUS.ABNORMAL);
-
-        String mtype = MicronDataCache.GetReelType(barcode.getPlateSize(), barcode.getHeight());
-
-        log.info("为入库单[" + inList.getName() + "]增加一条验证失败信息：barcode[" + barcode.getBarcode() + "],mtype[" + mtype + "],pn[" + barcode.getPartNumber() + "],rfid[" + rfid + "],s[" + INITEM_STATUS.API001NG + "],ngMsg["+error+":"+message+"]");
-
-        InListItem item = InListItem.newMItem(inList.getName(), barcode, rfid, "", INITEM_STATUS.API001NG, mtype);
-        if (inList.getEndRfidList() != null && inList.getEndRfidList().contains(rfid)) {
-            item.setRfidEnd(true);
-        }
-        item.setNgMsg(error+":"+message);
-        item = inListItemManager.save(item);
-        List<InListItem> items = inList.getInListItems();
-        items.add(item);
-        inList.setInListItems(items);
-        inListManager.save(inList);
-        inListCache.addInListToMap(inList);
-    }
+//    //获取库位号成功，增加一个正在入库的
+//    public void AddErrorItem(String rfid, Barcode barcode, Integer error,String message) {
+//        InList inList = getInlist();
+//
+//        if (inList == null) {
+//            return;
+//        }
+//        inList.addRfid(rfid);
+//        inList.setStatus(INLIST_STATUS.ABNORMAL);
+//
+//        String mtype = MicronDataCache.GetReelType(barcode.getPlateSize(), barcode.getHeight());
+//
+//        log.info("为入库单[" + inList.getName() + "]增加一条验证失败信息：barcode[" + barcode.getBarcode() + "],mtype[" + mtype + "],pn[" + barcode.getPartNumber() + "],rfid[" + rfid + "],s[" + INITEM_STATUS.API001NG + "],ngMsg["+error+":"+message+"]");
+//
+//        InListItem item = InListItem.newMItem(inList.getName(), barcode, rfid, "", INITEM_STATUS.API001NG, mtype);
+//        if (inList.getEndRfidList() != null && inList.getEndRfidList().contains(rfid)) {
+//            item.setRfidEnd(true);
+//        }
+//        item.setNgMsg(error+":"+message);
+//        item = inListItemManager.save(item);
+//        List<InListItem> items = inList.getInListItems();
+//        items.add(item);
+//        inList.setInListItems(items);
+//        inListManager.save(inList);
+//        inListCache.addInListToMap(inList);
+//    }
 
     //获取库位号成功，增加一个正在入库的
     public void AddInListItem(String rfid, Barcode barcode, String posName, String state, Boolean toXray) {

src/main/resources/config/application-prod.yml

@@ -10,6 +10,7 @@ micron:
   api_name_009: material/status
   api_name_010: material/track-out
   api_name_011: operation?mode={0}&username={1}&source={2}
+  api_name_012: operation/{0}
   api_name_101: operation/validation/mbr?id={0}&operationId={1}&skipSap={2}
   api_name_102: operation/validation/req?id={0}&operationId={1}
   api_name_103: operation/validation/gr?purchaseOrder={0}&packagingSlip={1}&operationId={2}&skipSap={3}
@@ -35,6 +36,7 @@ spring:
 
       #备份数据库配置
     backup-mongodb:
+#      host: 10.74.40.156
       host: 172.16.10.19
       port: 27017
       database: backup_smf

src/main/resources/messages.properties

@@ -362,6 +362,7 @@ smfcore.error.barcode.hastask=\u6761\u7801[0]\u5DF2\u6709\u5165\u5E93\u4EFB\u52A
 smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u53F7[0] \u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1\uFF0C\u51FA\u5E93\u524D\u4E0D\u5F97\u5165\u5E93\u76F8\u540C\u5E8F\u5217\u53F7\u7269\u6599 
 smfcore.error.noRetryReel=No material found to retry
 smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u5931\u8D25\uFF1A\u8FD8\u6709\u5165\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210
+smfcore.micron.modeError=\u53C2\u6570\u9519\u8BEF {0} \u5165\u5E93\u8FD8\u672A\u5B8C\u6210
 #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

@@ -360,4 +360,5 @@ smfcore.selfAudit.hasOutTask=The location [{0}] already has a release task
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
 smfcore.error.barcode.hasOutTask=Serial No.(S)[0] already have retrieval task, cannot store same Serial No. material before retrieval finish
 smfcore.error.noRetryReel=No material found to retry
-smfcore.micron.inlistCannotAbort=Operation failed: there are still inbound tasks to be completed
\ No newline at end of file
+smfcore.micron.inlistCannotAbort=Operation failed: there are still inbound tasks to be completed
+smfcore.micron.modeError=Parameter error. {0} Incoming not finished.
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -355,4 +355,5 @@ smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
 smfcore.error.barcode.hasOutTask=Serial No.(S)[0] already have retrieval task, cannot store same Serial No. material before retrieval finish
 smfcore.error.noRetryReel=No material found to retry
-smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A\u5B8C\u4E86\u3059\u3079\u304D\u53D7\u4FE1\u30BF\u30B9\u30AF\u304C\u6B8B\u3063\u3066\u3044\u307E\u3059
\ No newline at end of file
+smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u306B\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A\u5B8C\u4E86\u3059\u3079\u304D\u53D7\u4FE1\u30BF\u30B9\u30AF\u304C\u6B8B\u3063\u3066\u3044\u307E\u3059
+smfcore.micron.modeError=\u53C2\u6570\u9519\u8BEF {0} Loading \u8FD8\u672A\u5B8C\u6210
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -355,4 +355,5 @@ smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52
 smfcore.error.barcode.hastask=Serial No.(S)[0] already have storage task
 smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u53F7[0] \u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1\uFF0C\u51FA\u5E93\u524D\u4E0D\u5F97\u5165\u5E93\u76F8\u540C\u5E8F\u5217\u53F7\u7269\u6599
 smfcore.error.noRetryReel=\u6CA1\u6709\u53EF\u4EE5\u91CD\u8BD5\u7684\u7269\u6599
-smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u5931\u8D25\uFF1A\u8FD8\u6709\u5165\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210
\ No newline at end of file
+smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u5931\u8D25\uFF1A\u8FD8\u6709\u5165\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210
+smfcore.micron.modeError=\u53C2\u6570\u9519\u8BEF {0} \u5165\u5E93\u8FD8\u672A\u5B8C\u6210
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -356,4 +356,5 @@ smfcore.paretoChart=\u5E15\u7D2F\u6258\u5716
 smfcore.selfAudit.hasOutTask=\u5E93\u4F4D[{0}]\u5DF2\u6709\u51FA\u5E93\u4EFB\u52A1
 smfcore.error.barcode.hasOutTask=\u5E8F\u5217\u865F[0] \u5DF2\u6709\u51FA\u5EAB\u4EFB\u52D9\uFF0C\u51FA\u5EAB\u524D\u4E0D\u5F97\u5165\u5EAB\u76F8\u540C\u5E8F\u5217\u865F\u7269\u6599
 smfcore.error.noRetryReel=\u6C92\u6709\u53EF\u4EE5\u91CD\u8A66\u7684\u7269\u6599
-smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u5931\u8D25\uFF1A\u8FD8\u6709\u5165\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210
\ No newline at end of file
+smfcore.micron.inlistCannotAbort=\u64CD\u4F5C\u5931\u8D25\uFF1A\u8FD8\u6709\u5165\u5E93\u4EFB\u52A1\u672A\u5B8C\u6210
+smfcore.micron.modeError=\u53C2\u6570\u9519\u8BEF {0} \u5165\u5E93\u8FD8\u672A\u5B8C\u6210
\ No newline at end of file