屏蔽库位BUG修改

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -383,7 +383,7 @@ public class DeviceController {
         if (pos == null) {
         if (pos == null) {
             return ResultBean.newErrorResult(1, "smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", posId});
             return ResultBean.newErrorResult(1, "smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", posId});
         }
         }
-        pos.setEnabled(true);
+        pos.setEnabled(false);
         storagePosManager.save(pos);
         storagePosManager.save(pos);
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
 
 

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -426,6 +426,9 @@ public class DataCache {
                     if (ObjectUtil.isNotEmpty(s)) {
                     if (ObjectUtil.isNotEmpty(s)) {
                         for (String v :
                         for (String v :
                                 valueArray) {
                                 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);