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

rev：设备维修、报修管理修改

Browse Source
This commit is contained in:
liuxy
2023-09-06 11:07:12 +08:00
parent dbd57d25d1
commit a345d69cba
14 changed files with 168 additions and 1641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java
View File

@@ -374,6 +374,9 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
jsonReMst.put("invstatus", "06");
jsonReMst.put("real_end_date", DateUtil.now());
jsonReMst.put("confirm_optid", currentUserId);
jsonReMst.put("confirm_optname", nickName);
jsonReMst.put("confirm_time", DateUtil.now());
reMstTab.update(jsonReMst);
// 3.更新设备档案表
JSONObject jsonFile = fileTab.query("devicerecord_id = '" + jsonReMst.getString("devicerecord_id") + "' and is_delete = '0'").uniqueResult(0);

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIRREQUEST_01.wql
View File

@@ -129,7 +129,7 @@
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN EM_BI_DeviceFaultClass class2 ON mst.device_faultclass_id = class2.device_faultclass_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
@@ -183,7 +183,7 @@
AND mst.invstatus = '06'
OPTION 输入.deptIds <> ""
file.use_groupid in 输入.deptIds
file.use_deptid in 输入.deptIds
ENDOPTION
ENDSELECT
ENDQUERY

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/wql/EM_BI_DEVICEREPAIR_01.wql
View File

@@ -68,7 +68,7 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
@@ -122,7 +122,7 @@
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND mst.invstatus in (07,99)
AND mst.invstatus in (06,99)
OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or
@@ -280,7 +280,7 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
LEFT JOIN EM_BI_DeviceRepairRecord r ON r.repair_id = mst.repair_id
LEFT JOIN EM_BI_DeviceRepairRequest RepairRequest ON RepairRequest.request_id = mst.source_bill_id
WHERE
@@ -336,7 +336,7 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
@@ -391,7 +391,7 @@
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
LEFT JOIN sys_dept d2 ON file.use_deptid = d2.dept_id
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'