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-10-17 16:34:18 +08:00
parent 2108c56109
commit 32ded42385
8 changed files with 231 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -110,6 +110,12 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
// 归属部门
String use_groupid = MapUtil.getStr(whereJson, "use_groupid");
if (!StrUtil.isEmpty(use_groupid)) {
String use_groupidIds = deptService.getChildIdStr(Long.parseLong(use_groupid));
map.put("use_groupid", use_groupidIds);
}
JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC");
return json;
}

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
View File

@@ -21,6 +21,7 @@
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.deptIds TYPEAS f_string
输入.use_groupid TYPEAS f_string
[临时表]
@@ -144,7 +145,9 @@
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.use_groupid <> ""
d2.dept_id in 输入.use_groupid
ENDOPTION
OPTION 输入.deptIds <> ""
d1.dept_id in 输入.deptIds
ENDOPTION

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
import org.nl.modules.security.service.dto.JwtUserDto;
import org.nl.modules.system.service.DeptService;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SpringContextHolder;
@@ -559,6 +560,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
@Override
public Map<String, Object> query4(Map whereJson, Pageable page) {
DeptService deptService = SpringContextHolder.getBean(DeptService.class);
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code");
@@ -585,12 +587,19 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
return json;
}
@Override
public Map<String, Object> query5(Map whereJson, Pageable page) {
DeptService deptService = SpringContextHolder.getBean(DeptService.class);
String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code");
@@ -619,6 +628,12 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds);
}
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
return json;
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
View File

@@ -23,6 +23,7 @@
输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string
输入.maint_object TYPEAS s_string
输入.deptIds TYPEAS f_string
[临时表]
@@ -324,7 +325,9 @@
(mst.maint_code like 输入.maint_code or
mst.maint_code like 输入.maint_code)
ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
@@ -384,7 +387,9 @@
OPTION 输入.classIds <> ""
class.class_id in 输入.classIds
ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.maintenancecycle <> ""
mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION