条码增加4L。pn与mpn相同时，发送partNumber为空。

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

@@ -214,6 +214,12 @@ public class BarcodeRule {
                         log.info("p20: 为" +  newRule.p20_item.toString());
                     }
                 }
+                if(!newRule.p4L_item.hasThisField()){
+                    if(newRule.p4L_item.matchRule(fieldValue, i)){
+                        log.info("p4L: 为" +  newRule.p4L_item.toString());
+                    }
+                }
+
             }
             boolean validRule = false;
             if(newRule.partNumber_item.hasThisField()){
@@ -263,6 +269,7 @@ public class BarcodeRule {
     private RuleItem q_item  = new RuleItem("QITEM");
     private RuleItem q1_item  = new RuleItem("Q1ITEM");
     private RuleItem p20_item  = new RuleItem("P20ITEM");
+    private RuleItem p4L_item  = new RuleItem("4LITEM");
 
     private class RuleItem{
         private RuleItem(String ruleName) {
@@ -700,6 +707,11 @@ public class BarcodeRule {
             b.setP20Item(q);
 
         }
+
+        if(p4L_item.hasThisField()){
+            String p4LStr=p4L_item.getStrValue(codeArr);
+            b.setP4LItem(p4LStr);
+        }
         b.setBarcode(reelId);
         codeBean.setCodeStr(reelId);
         b.setPartNumber(partNumber);
@@ -918,7 +930,7 @@ 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]";
 //        codeStr="PMT40A512M16TB-062E:R|1PMT40A512M16TB-062E:R|1TJFRY1W7.11|7Q918+EA|SJFRY1W7.11|21PMICRON||9D20230730||||7E3";
 
-        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]";
+        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";
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
@@ -938,6 +950,7 @@ public class BarcodeRule {
             System.out.println("Q1:"+b.getQ1Item());
             System.out.println("P20:"+b.getP20Item());
             System.out.println("SP:"+b.getProvider());
+            System.out.println("4L:"+b.getP4LItem());
         }else{
             System.out.println("解析失败");
             log.info("解析失败");

src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

@@ -270,6 +270,8 @@ public class Barcode extends BasePo implements Serializable {
 
     private String p20Item;
 
+    private String p4LItem;
+
     /**
      * 是否需要去点料机点料
      */

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

@@ -30,6 +30,7 @@ public class AMaterialBean {
     private String containerType;
     private Integer arraySize;
     private Integer panelNum;
+    private String p4LItem;
 
     public static AMaterialBean toBean(Barcode barcode) {
 
@@ -67,6 +68,7 @@ public class AMaterialBean {
         bean.containerType = reelType;//类型
         bean.arraySize = ToInt(barcode.getQ1Item(), 0);//1Q
         bean.panelNum = ToInt(barcode.getQItem(), 0);//Q
+        bean.p4LItem=barcode.getP4LItem();
 
         return bean;
     }
@@ -83,7 +85,11 @@ public class AMaterialBean {
         Map<String, Object> resultMap = new HashMap<>();
 
         resultMap.put("serialNum", serialNum);
-        resultMap.put("partNumber", partNumber);
+        if(partNumber.equals(mfgPartNum)){
+            resultMap.put("partNumber", "");
+        }else {
+            resultMap.put("partNumber", partNumber);
+        }
         resultMap.put("sapItem", sapItem);
         resultMap.put("mfgPartNum", mfgPartNum);
         resultMap.put("mfgLotNum", mfgLotNum);
@@ -101,6 +107,10 @@ public class AMaterialBean {
             resultMap.put("arraySize", null);//1Q
             resultMap.put("panelNum", null);//Q
         }
+        //RawMaterialOrigin 4L
+        if(ObjectUtil.isNotEmpty(p4LItem)){
+            resultMap.put("RawMaterialOrigin",p4LItem);
+        }
         return resultMap;
     }