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

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-30 16:47:52 +08:00
parent b757d25d6c
commit b8bf6dad65
3 changed files with 86 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicesparepartivtServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.utils.FileUtil;
import org.nl.wms.basedata.master.service.ClassstandardService;
import org.nl.wms.sb.stat.service.DevicesparepartivtService;
import org.nl.wms.sb.stat.service.dto.DevicesparepartivtDto;
import org.nl.wql.WQL;
@@ -41,11 +42,15 @@ import javax.servlet.http.HttpServletResponse;
@RequiredArgsConstructor
@Slf4j
public class DevicesparepartivtServiceImpl implements DevicesparepartivtService {
private final ClassstandardService classstandardService;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String material_code = MapUtil.getStr(whereJson, "material_code");
String is_all = MapUtil.getStr(whereJson, "is_all");
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
HashMap<String, String> map = new HashMap<>();
if (ObjectUtil.isEmpty(is_all) || StrUtil.equals(is_all, "0")) {
@@ -56,6 +61,15 @@ public class DevicesparepartivtServiceImpl implements DevicesparepartivtService
map.put("stor_id", MapUtil.getStr(whereJson,"stor_id"));
map.put("sect_id", MapUtil.getStr(whereJson,"sect_id"));
if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%"+material_code+"%");
//处理物料当前节点的所有子节点
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);
}
JSONObject json = WQL.getWO("EM_DEVICEIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.material_id DESC");
return json;
}

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEIVT001.wql
View File

@@ -17,6 +17,7 @@
输入.stor_id TYPEAS s_string
输入.sect_id TYPEAS s_string
输入.material_code TYPEAS s_string
输入.classIds TYPEAS f_string
[临时表]
@@ -53,11 +54,13 @@
ivt.pcsn,
sum(ivt.ivt_qty) AS ivt_qty,
MAX(ivt.qty_unit_name) AS qty_unit_name,
MAX(ivt.instorage_time) AS instorage_time
MAX(ivt.instorage_time) AS instorage_time,
class.class_name
FROM
EM_BI_DeviceSparePartIvt ivt
LEFT JOIN ST_IVT_StructAttr struct ON ivt.struct_id = struct.struct_id
LEFT JOIN MD_ME_MaterialBase me ON me.material_id = ivt.material_id
LEFT JOIN md_pb_classstandard class ON me.material_type_id = class.class_id
WHERE 1=1
OPTION 输入.stor_id <> ""
struct.stor_id = 输入.stor_id
@@ -71,6 +74,10 @@
me.material_code like 输入.material_code)
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
group by ivt.material_id,ivt.pcsn
ENDSELECT
@@ -86,11 +93,13 @@
me.material_name,
me.material_spec,
me.material_model,
class.class_name,
ivt.*
FROM
EM_BI_DeviceSparePartIvt ivt
LEFT JOIN ST_IVT_StructAttr struct ON ivt.struct_id = struct.struct_id
LEFT JOIN MD_ME_MaterialBase me ON me.material_id = ivt.material_id
LEFT JOIN md_pb_classstandard class ON me.material_type_id = class.class_id
WHERE 1=1
OPTION 输入.stor_id <> ""
struct.stor_id = 输入.stor_id
@@ -104,6 +113,10 @@
me.material_code like 输入.material_code)
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF