校验库位物品接口修改。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java

@@ -417,9 +417,6 @@ public class LocationServiceImpl implements LocationService {
             List<RuleRespVO> ruleRespVOList = ruleService.getGroundingList(locationValidateVO.getItemCode(), locationValidateVO.getInventoryStatus());
             boolean validateResult = false;
             String msg = "";
-            if(ruleRespVOList.size() == 1) {
-                validateResult = true;
-            } else {
             for (RuleRespVO ruleRespVO : ruleRespVOList) {
                 JSONObject jsonObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
                 //增加过滤条件
@@ -485,7 +482,6 @@ public class LocationServiceImpl implements LocationService {
                     break;
                 }
             }
-            }
             Map<String, Object> map = new HashMap<>();
             map.put("itemCode", locationValidateVO.getItemCode());
             map.put("batch", locationValidateVO.getBatch());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -538,8 +538,8 @@ public class RuleServiceImpl implements RuleService {
         for (RuleDO ruleDO : ruleDOList) {
             String condition = ruleDO.getCondition();
             if (condition == null || condition.isEmpty()) {
-                ruleRespVOList.add(RuleConvert.INSTANCE.convert(ruleDO));
+                continue;
-            } else {
+            }
             JSONArray conditionArray = JSONUtil.parseArray(condition);
             Map<String, String> params = new HashMap<>();
             if (itemCode != null && !itemCode.isEmpty()) {
@@ -552,7 +552,6 @@ public class RuleServiceImpl implements RuleService {
                 ruleRespVOList.add(RuleConvert.INSTANCE.convert(ruleDO));
             }
         }
-        }
         return ruleRespVOList;
     }