条码解析时可以没有生产日期

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

@@ -386,6 +386,9 @@ public class BarcodeRule {
                     if(codeValue.length() < prefix + suffix){
                     if(codeValue.length() < prefix + suffix){
                         return null;
                         return null;
                     }
                     }
+                    if(codeValue.length()<=0){
+                        return null;
+                    }
 
 
                     if(!Strings.isNullOrEmpty(startWith)){
                     if(!Strings.isNullOrEmpty(startWith)){
                         //不是以startWith开头
                         //不是以startWith开头
@@ -633,11 +636,11 @@ public class BarcodeRule {
         }
         }
 
 
         Date produceDate= produceDate_item.getDateValue(codeArr);
         Date produceDate= produceDate_item.getDateValue(codeArr);
-        if(produceDate_item.hasThisField() && produceDate == null){
-            log.info("条码解析失败,PRODATE字段不合规则");
-            codeBean.setError("smfcore.error.barcode.noField",new String[]{"PRODATE"},"PRODATE字段不合规则");
-            return codeBean;
-        }
+//        if(produceDate_item.hasThisField() && produceDate == null){
+//            log.info("条码解析失败,PRODATE字段不合规则");
+//            codeBean.setError("smfcore.error.barcode.noField",new String[]{"PRODATE"},"PRODATE字段不合规则");
+//            return codeBean;
+//        }
         Date expireDate= expireDate_item.getDateValue(codeArr);
         Date expireDate= expireDate_item.getDateValue(codeArr);
         if(produceDate != null && expireDate == null){
         if(produceDate != null && expireDate == null){
             Calendar c = Calendar.getInstance();
             Calendar c = Calendar.getInstance();
@@ -865,8 +868,11 @@ public class BarcodeRule {
 
 
         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";
 //        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##";
 //        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]";
+        rule="PN[1:0:-1]|MPN[2:0:-1]QITEM[2:2:-1]Q1ITEM[3:0:6]|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]";
 
 
+        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]";
+        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";
         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){