bug修改

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

@@ -847,6 +847,9 @@ public class BarcodeRule {
         codeStr="100301*340093060042*20231228*2853*0002";
         codeStr="100301*340093060042*20231228*2853*0002";
 //        codeStr="woerweoruweorwer*wrwerwerwe";
 //        codeStr="woerweoruweorwer*wrwerwerwe";
 
 
+        rule="PN;RI;BATCH;1;1;1;1";
+        codeStr="T002;1002;10;T002;1002;10;1";
+
         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){

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -195,8 +195,11 @@ public class BoxKanbanController {
                 String[] blurrys = blurry.split(",");
                 String[] blurrys = blurry.split(",");
                 String[] valueArray = new String[]{datalog.getPosName(), datalog.getStorageName(), datalog.getCid(), datalog.getPartNumber(), datalog.getBarcode(), datalog.getSourceName()};
                 String[] valueArray = new String[]{datalog.getPosName(), datalog.getStorageName(), datalog.getCid(), datalog.getPartNumber(), datalog.getBarcode(), datalog.getSourceName()};
                 for (String s : blurrys) {
                 for (String s : blurrys) {
-                    if(ObjectUtil.isNotEmpty(s)){
+                    if (ObjectUtil.isNotEmpty(s)) {
                         for (String v : valueArray) {
                         for (String v : valueArray) {
+                            if (ObjectUtil.isEmpty(v)) {
+                                continue;
+                            }
                             try {
                             try {
                                 Pattern pattern = Pattern.compile(QueryHelp.escapeExprSpecialWord(s), Pattern.CASE_INSENSITIVE);
                                 Pattern pattern = Pattern.compile(QueryHelp.escapeExprSpecialWord(s), Pattern.CASE_INSENSITIVE);
                                 Matcher m = pattern.matcher(v);
                                 Matcher m = pattern.matcher(v);
@@ -205,14 +208,13 @@ public class BoxKanbanController {
                                     break;
                                     break;
                                 }
                                 }
                                 if (blurryOk) break;
                                 if (blurryOk) break;
-                                }catch (Exception ex){
+                            } catch (Exception ex) {
                                 log.error(ex.toString());
                                 log.error(ex.toString());
                             }
                             }
                         }
                         }
                         if (blurryOk) break;
                         if (blurryOk) break;
-                    }
-                    else{
-                        blurryOk=true;
+                    } else {
+                        blurryOk = true;
                     }
                     }
 
 
                 }
                 }