条码解析增加Q,Q1;

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

@@ -203,6 +203,15 @@ public class BarcodeRule {
                         log.info("expireDay: 为" +  newRule.expireDay_item.toString());
                     }
                 }
+                if(!newRule.q1_item.hasThisField()){
+                    if(newRule.q1_item.matchRule(fieldValue, i)){
+                        log.info("q1: 为" +  newRule.q1_item.toString());
+                    }
+                } if(!newRule.q_item.hasThisField()){
+                    if(newRule.q_item.matchRule(fieldValue, i)){
+                        log.info("q: 为" +  newRule.q_item.toString());
+                    }
+                }
             }
             boolean validRule = false;
             if(newRule.partNumber_item.hasThisField()){
@@ -249,6 +258,8 @@ public class BarcodeRule {
     private RuleItem msl_item  = new RuleItem("MSL");
     private RuleItem memo_item  = new RuleItem("MEMO");
     private RuleItem mpn_item  = new RuleItem("MPN");
+    private RuleItem q_item  = new RuleItem("QITEM");
+    private RuleItem q1_item  = new RuleItem("Q1ITEM");
 
     private class RuleItem{
         private RuleItem(String ruleName) {
@@ -666,6 +677,17 @@ public class BarcodeRule {
             b.setMemo(memo);
         }
 
+        if(q1_item.hasThisField()){
+            String q1 = q1_item.getStrValue(codeArr);
+            b.setQ1Item(q1);
+
+        }
+        if(q_item.hasThisField()){
+            String q = q_item.getStrValue(codeArr);
+            b.setQItem(q);
+
+        }
+
         b.setBarcode(reelId);
         codeBean.setCodeStr(reelId);
         b.setPartNumber(partNumber);
@@ -842,8 +864,8 @@ public class BarcodeRule {
 //        rule="PN[1:0:-1]|BATCH[2:0:-1]|LOT[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx";
 
         codeStr="P529-500089|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|21PMICROCHIP|9D20220704|4LTW|7E4";
-        codeStr="P529-500089|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|21PMICROCHIP|9D20220704|4LTW|7E4|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|XXX|XXX|9D20220704|XXX|XXX|XXX|XXX|xxx##";
-        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]|PRODATEyyyyMMdd[2:0:-1]|xxx|MSL[1:0:-1]";
+//        codeStr="P529-500089|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|21PMICROCHIP|9D20220704|4LTW|7E4|1PPM8607B1-F3EI|1T2314003080|7Q33+EA|S10000000000263353|XXX|XXX|9D20220704|XXX|XXX|XXX|XXX|xxx##";
+        rule="PN[1:0:-1]|MPN[2:0:-1]QITEM[2:0:-1]Q1ITEM[3:0:-1]|BATCH[2:0:-1]|QTY[2_7Q:0:-1]|RI[1:0:-1]|SP[3:0:-1]|PRODATEyyyyMMdd[2:0:-1]|xxx|MSL[1:0:-1]";
 
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
@@ -859,6 +881,8 @@ public class BarcodeRule {
             System.out.println("Supllier:"+b.getProvider());
             System.out.println("Memo:"+b.getMemo());
             System.out.println("MPN:"+b.getMpn());
+            System.out.println("Q:"+b.getQItem());
+            System.out.println("Q1:"+b.getQ1Item());
         }else{
             System.out.println("解析失败");
             log.info("解析失败");

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

@@ -231,6 +231,10 @@ public class Barcode extends BasePo implements Serializable {
      */
     private Date sluggishTime;
 
+    private String qItem;
+
+    private String q1Item;
+
     /**
      * 自定义的附加信息
      */