root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-11-23 10:53:00 +08:00
parent d9793a61c2
commit 5307da8278
3 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java
View File

@@ -54,15 +54,18 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
String material_code = (String) whereJson.get("material_code"); String material_code = (String) whereJson.get("material_code");
String material_type_id = (String) whereJson.get("material_type_id"); String material_type_id = (String) whereJson.get("material_type_id");
String class_idStr = (String) whereJson.get("class_idStr"); String class_idStr = (String) whereJson.get("class_idStr");
String ids = MapUtil.getStr(whereJson, "ids");
map.put("flag", "1"); map.put("flag", "1");
if (!StrUtil.isEmpty(material_code)) { if (!StrUtil.isEmpty(material_code)) {
//处理转义字符 //处理转义字符
if (material_code.contains("\\")) material_code = material_code.replace("\\", "\\\\\\"); if (material_code.contains("\\")) {
map.put("material_code", material_code); material_code = material_code.replace("\\", "\\\\\\");
map.put("search", material_code); }
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)) { if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", 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); String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds); map.put("classIds", classIds);
} }
String class_code = (String) whereJson.get("class_code"); map.put("idssql", "1=1");
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("flag", "2"); map.put("flag", "2");
JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id"); JSONObject allmaterialIds = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id");
JSONArray array = allmaterialIds.getJSONArray("content"); JSONArray array = allmaterialIds.getJSONArray("content");
@@ -103,9 +86,10 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
Map<String, String> query = Maps.newHashMap(); Map<String, String> query = Maps.newHashMap();
query.put("flag", "11"); query.put("flag", "11");
query.put("materialIds", allmaterialId); query.put("materialIds", allmaterialId);
if (ObjectUtil.isNotEmpty(array)){
JSONArray currentArray = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(query).process().getResultJSONArray(0); JSONArray currentArray = WQL.getWO("QMT_MATERIALPARAMETERS_001").addParamMap(query).process().getResultJSONArray(0);
allmaterialIds.put("content",currentArray); allmaterialIds.put("content",currentArray);
}
return allmaterialIds; return allmaterialIds;
} }

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java
View File

@@ -109,8 +109,10 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
Map<String, String> query = Maps.newHashMap(); Map<String, String> query = Maps.newHashMap();
query.put("flag", "3"); query.put("flag", "3");
query.put("materialIds", allmaterialId); query.put("materialIds", allmaterialId);
JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0); if (ObjectUtil.isNotEmpty(array)){
allmaterialIds.put("content",currentArray); JSONArray currentArray = WQL.getWO("QMD_ME_MATERIAL").addParamMap(query).process().getResultJSONArray(0);
allmaterialIds.put("content",currentArray);
}
return allmaterialIds; return allmaterialIds;
} }

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMT_MATERIALPARAMETERS_001.wql
View File

@@ -271,3 +271,4 @@
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF