From d3c9cb96fe63db83028c4aac68ca091fc7cad122 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 11 Oct 2022 15:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/em/wql/em.xls | Bin 313344 -> 313344 bytes .../sb/repair/wql/EM_BI_DEVICEREPAIR001.wql | 5 +++-- .../em/equipmentfile/ChangeDialog.vue | 3 +++ .../wms/sb/repair/devicerepairpa/index.vue | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/em.xls index f6d8dc701ccd87d3267bae380f548f3803df5d02..968ce29d287c038bf4565f66254d95ff4df5228a 100644 GIT binary patch delta 61 zcmZpeAlxuPctZ{gYeSbtk=^D(mhFuEYz&M!45F*7juL_|(@WDB1hz$V;0gROlA8zT@i0WtIT J8Eh;W2LTaf5()qS diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql index 62e5bd85..8d5920e8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql @@ -273,7 +273,8 @@ r.fault_comment, r.fault_cause, r.fault_analysis, - r.measure + r.measure, + RepairRequest.create_name AS request_name FROM EM_BI_DeviceRepairMst mst LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id @@ -281,11 +282,11 @@ 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 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 mst.is_delete = '0' AND file.is_delete = '0' AND mst.invstatus not in ('04','06','99') - OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or file.device_name like 输入.device_code) diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue index c7c6b526..35c729ad 100644 --- a/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue +++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/ChangeDialog.vue @@ -47,6 +47,9 @@ + + + diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue index 6d17f009..c944ceda 100644 --- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue +++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue @@ -149,14 +149,15 @@ + - - + +