条码规则创建时,替换掉已经匹配的字段

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

@@ -146,32 +146,38 @@ public class BarcodeRule {
                 if(!newRule.whole_reelId_item.hasThisField() && !newRule.reelId_item.hasThisField()){
                 if(!newRule.whole_reelId_item.hasThisField() && !newRule.reelId_item.hasThisField()){
                     if(newRule.whole_reelId_item.matchRule(fieldValue, i)){
                     if(newRule.whole_reelId_item.matchRule(fieldValue, i)){
                         log.info("whole reelId: 为" +  newRule.whole_reelId_item.toString());
                         log.info("whole reelId: 为" +  newRule.whole_reelId_item.toString());
+                        fieldValue = fieldValue.replace(newRule.whole_reelId_item.name,"");
                     }else if(newRule.reelId_item.matchRule(fieldValue, i)){
                     }else if(newRule.reelId_item.matchRule(fieldValue, i)){
                         log.info("reelId: 为" +  newRule.reelId_item.toString());
                         log.info("reelId: 为" +  newRule.reelId_item.toString());
+                        fieldValue = fieldValue.replace(newRule.reelId_item.name,"");
                     }
                     }
                 }
                 }
 
 
                 if(!newRule.batch_item.hasThisField()){
                 if(!newRule.batch_item.hasThisField()){
                     if(newRule.batch_item.matchRule(fieldValue, i)){
                     if(newRule.batch_item.matchRule(fieldValue, i)){
                         log.info("batch: 为" +  newRule.batch_item.toString());
                         log.info("batch: 为" +  newRule.batch_item.toString());
+                        fieldValue = fieldValue.replace(newRule.batch_item.name,"");
                     }
                     }
                 }
                 }
 
 
                 if(!newRule.quantity_item.hasThisField()){
                 if(!newRule.quantity_item.hasThisField()){
                     if(newRule.quantity_item.matchRule(fieldValue, i)){
                     if(newRule.quantity_item.matchRule(fieldValue, i)){
                         log.info("quantity: 为" +  newRule.quantity_item.toString());
                         log.info("quantity: 为" +  newRule.quantity_item.toString());
+                        fieldValue = fieldValue.replace(newRule.quantity_item.name,"");
                     }
                     }
                 }
                 }
 
 
                 if(!newRule.supplier_item.hasThisField()){
                 if(!newRule.supplier_item.hasThisField()){
                     if(newRule.supplier_item.matchRule(fieldValue, i)){
                     if(newRule.supplier_item.matchRule(fieldValue, i)){
                         log.info("supplier: 为" +  newRule.supplier_item.toString());
                         log.info("supplier: 为" +  newRule.supplier_item.toString());
+                        fieldValue = fieldValue.replace(newRule.supplier_item.name,"");
                     }
                     }
                 }
                 }
 
 
                 if(!newRule.msl_item.hasThisField()){
                 if(!newRule.msl_item.hasThisField()){
                     if(newRule.msl_item.matchRule(fieldValue, i)){
                     if(newRule.msl_item.matchRule(fieldValue, i)){
                         log.info("MSL: 为" +  newRule.msl_item.toString());
                         log.info("MSL: 为" +  newRule.msl_item.toString());
+                        fieldValue = fieldValue.replace(newRule.msl_item.name,"");
                     }
                     }
                 }
                 }
 
 
@@ -849,6 +855,10 @@ public class BarcodeRule {
         rule = "RI,PRODATEyyWW,PN,QTY,MSL,BATCH";
         rule = "RI,PRODATEyyWW,PN,QTY,MSL,BATCH";
         codeStr = "GW00001";
         codeStr = "GW00001";
         rule = "PN[-1:2:-1]RI[-1:0:-1]";
         rule = "PN[-1:2:-1]RI[-1:0:-1]";
+        codeStr = "[[)>@06@12S0002@PA5E00235777@1PRMC1/8K182FTP@6D20241218@V4000014286@5YMAF241HG4@Q5000@1T360P027469@@";
+        rule = "1@2@3@xPN@5@6@7@RI@xQTY@10@@";
+        codeStr = "671200%10000%1MTR";
+        rule = "PN%QTY%BATCH[RI]";
         BarcodeRule br = BarcodeRule.newRule(rule);
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         Barcode b = br.toCodeBean(codeStr).getBarcode();
         if(b != null){
         if(b != null){