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

opt:物料相关页面添加物料分类字段

Browse Source
This commit is contained in:
zds
2025-06-16 17:22:37 +08:00
parent 68da12a72a
commit 4eb0f8b060
5 changed files with 68 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/service/impl/MaterialbaseServiceImpl.java
View File

@@ -46,10 +46,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
//只查询木箱
String box = MapUtil.getStr(whereJson, "box");
//物料限制的时候使用，初始化页面
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_code = MapUtil.getStr(whereJson, "class_code");
String ids = MapUtil.getStr(whereJson, "ids");
HashMap<String, String> map = new HashMap<>();
@@ -71,35 +68,26 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
}
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);
String classIds = classstandardService.getChildIdStr(material_type_id);
map.put("classIds", classIds);
} else if (ObjectUtil.isNotEmpty(class_idStr)) {
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
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(",");
if (StrUtil.isNotEmpty(material_type_id)) {
material_type_id = material_type_id.replaceAll("\'", "");
String[] strs = material_type_id.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 ");
if(i!=0){
where.append(",");
}
i++;
where.append("'");
if (i <= strs.length) {
where.append(strs[i-1]);
}
where.append("'");
}
where.append(")");
map.put("idssql", where.toString());
map.put("material_type_ids", where.toString());
} else {
map.put("idssql", "1=1");
map.put("material_type_ids", "");
}
JSONObject jo = WQL.getWO("QMD_ME_MATERIAL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_id");

32
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_ME_MATERIAL.wql
View File

@@ -16,7 +16,7 @@
输入.flag TYPEAS s_string
输入.search TYPEAS s_string
输入.box TYPEAS s_string
输入.class_code TYPEAS s_string
输入.material_type_ids TYPEAS f_string
输入.idssql TYPEAS f_string
输入.classIds TYPEAS f_string
@@ -47,24 +47,28 @@
SELECT
mb.*,
unit_name,
unit_name as base_unit_id_name
unit_name as base_unit_id_name,
mb.material_type_id as class_code,
dict.label as class_name
FROM
md_me_materialbase mb
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id
LEFT JOIN sys_dict dict ON (dict.value = mb.material_type_id and dict.code='material_type')
WHERE
mb.is_delete = '0'
OPTION 输入.search <> ""
(
mb.material_code like 输入.search
OR
mb.material_name like 输入.search
)
ENDOPTION
OPTION 输入.box <> ""
(
mb.material_name like 输入.box
)
ENDOPTION
OPTION 输入.search <> ""
(
mb.material_code like 输入.search
OR
mb.material_name like 输入.search
)
ENDOPTION
OPTION 输入.box <> ""
mb.material_name like 输入.box
ENDOPTION
OPTION 输入.material_type_ids <> ""
mb.material_type_id in 输入.material_type_ids
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF