条码增加P20Item

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

@@ -211,6 +211,10 @@ public class BarcodeRule {
                     if(newRule.q_item.matchRule(fieldValue, i)){
                         log.info("q: 为" +  newRule.q_item.toString());
                     }
+                }if(!newRule.p20_item.hasThisField()){
+                    if(newRule.p20_item.matchRule(fieldValue, i)){
+                        log.info("p20: 为" +  newRule.p20_item.toString());
+                    }
                 }
             }
             boolean validRule = false;
@@ -260,6 +264,7 @@ public class BarcodeRule {
     private RuleItem mpn_item  = new RuleItem("MPN");
     private RuleItem q_item  = new RuleItem("QITEM");
     private RuleItem q1_item  = new RuleItem("Q1ITEM");
+    private RuleItem p20_item  = new RuleItem("P20ITEM");
 
     private class RuleItem{
         private RuleItem(String ruleName) {
@@ -692,7 +697,11 @@ public class BarcodeRule {
             b.setQItem(q);
 
         }
+        if(p20_item.hasThisField()){
+            String q = p20_item.getStrValue(codeArr);
+            b.setP20Item(q);
 
+        }
         b.setBarcode(reelId);
         codeBean.setCodeStr(reelId);
         b.setPartNumber(partNumber);
@@ -876,8 +885,9 @@ public class BarcodeRule {
         codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON|2D06-28-2025|||||7E2";
         codeStr="P594730|1PMT40A8G4BAF-062E:B|1TDRBRDRL.41|7Q897+EA|SDRBRDRL.41|21PMICRON||||||7E2";
         codeStr="P721823|1PMT29FB16T08EALAAD6-QC:C|1TBY8GH95.41|7Q282|SBY8GH95.41||2D07-04-2025|||||";
-        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]|xxx|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]|xxx|MSL[1:0:-1]P20ITEM[1:0:-1]";
         codeStr="P550-502922C|1P3217-10-01-C|1TD116223H|7Q1000+EA|SP2SITPCB001|21PSIMMTECH|2D12-31-2025||Q10|1Q10||7E1";
+        codeStr="P550-502922C|1P3217-10-01-C|1TD116223H|7Q1000+EA|SP2SITPCB001|||||||";
 
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
@@ -895,6 +905,7 @@ public class BarcodeRule {
             System.out.println("MPN:"+b.getMpn());
             System.out.println("Q:"+b.getQItem());
             System.out.println("Q1:"+b.getQ1Item());
+            System.out.println("P20:"+b.getP20Item());
             System.out.println("SP:"+b.getProvider());
         }else{
             System.out.println("解析失败");

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

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

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

 package com.neotel.smfcore.custom.micron1053.api;
 
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.custom.micron1053.util.MicronDataCache;
 import lombok.Data;
@@ -36,7 +37,10 @@ public class AMaterialBean {
 
         bean.serialNum = barcode.getBarcode();
         bean.partNumber = barcode.getPartNumber();
-        bean.sapItem = true;
+        bean.sapItem = false;
+        if(ObjectUtil.isNotEmpty(barcode.getP20Item())){
+            bean.sapItem=true;
+        }
         bean.mfgPartNum = barcode.getMpn();
         bean.mfgLotNum = barcode.getMbatch();
         bean.mfgName = barcode.getProvider();