From 5307da8278978f1e07af1b876398ebbcf022b940 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Wed, 23 Nov 2022 10:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MaterialParametersServiceImpl.java | 42 ++++++------------- .../service/impl/MaterialbaseServiceImpl.java | 6 ++- .../master/wql/QMT_MATERIALPARAMETERS_001.wql | 1 + 3 files changed, 18 insertions(+), 31 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java index 38ee3c41..e2e9fe0f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java @@ -54,15 +54,18 @@ public class MaterialParametersServiceImpl implements MaterialParametersService String material_code = (String) whereJson.get("material_code"); String material_type_id = (String) whereJson.get("material_type_id"); String class_idStr = (String) whereJson.get("class_idStr"); - String ids = MapUtil.getStr(whereJson, "ids"); map.put("flag", "1"); if (!StrUtil.isEmpty(material_code)) { //处理转义字符 - if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\"); - map.put("material_code", material_code); - map.put("search", material_code); + if (material_code.contains("\\")) { + material_code = material_code.replace("\\", "\\\\\\"); + } + map.put("material_code", "%"+material_code + "%"); + map.put("search", "%"+material_code + "%"); + } + if("null".equals(class_idStr) || StrUtil.isEmpty(class_idStr)){ + class_idStr = MaterOptTypeEnum.BCP_AND_YFL.getClass_idStr(); } - //处理物料当前节点的所有子节点 if (!StrUtil.isEmpty(material_type_id)) { map.put("material_type_id", material_type_id); @@ -72,27 +75,7 @@ public class MaterialParametersServiceImpl implements MaterialParametersService String classIds = classstandardService.getAllChildIdStr(class_idStr); map.put("classIds", classIds); } - String class_code = (String) whereJson.get("class_code"); - if (!StrUtil.isEmpty(class_code)) { - map.put("class_code", class_code + "%"); - } - StringBuffer where = new StringBuffer(); - if (StrUtil.isNotEmpty(ids)) { - ids = ids.replaceAll("\'", ""); - String[] strs = ids.split(","); - where.append("("); - for (int i = 0; i < strs.length; ) { - where.append("class.class_code like '" + strs[i] + "%'"); - i++; - if (i < strs.length) { - where.append(" or "); - } - } - where.append(")"); - map.put("idssql", where.toString()); - } else { - map.put("idssql", "1=1"); - } + map.put("idssql", "1=1"); map.put("flag", "2"); JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id"); JSONArray array = allmaterialIds.getJSONArray("content"); @@ -103,9 +86,10 @@ public class MaterialParametersServiceImpl implements MaterialParametersService Map query = Maps.newHashMap(); query.put("flag", "11"); query.put("materialIds", allmaterialId); - - JSONArray currentArray = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(query).process().getResultJSONArray(0); - allmaterialIds.put("content",currentArray); + if (ObjectUtil.isNotEmpty(array)){ + JSONArray currentArray = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(query).process().getResultJSONArray(0); + allmaterialIds.put("content",currentArray); + } return allmaterialIds; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java index 31007a07..92ef3137 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java @@ -109,8 +109,10 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { Map query = Maps.newHashMap(); query.put("flag", "3"); query.put("materialIds", allmaterialId); - JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0); - allmaterialIds.put("content",currentArray); + if (ObjectUtil.isNotEmpty(array)){ + JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0); + allmaterialIds.put("content",currentArray); + } return allmaterialIds; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql index e180abb0..b7fa58cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql @@ -271,3 +271,4 @@ ENDSELECT ENDPAGEQUERY ENDIF +