From 4b4d94f411eee4d459a6556e100710278c56a830 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 18 十月 2023 14:22:07 +0800
Subject: [PATCH] 三保验收单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index 65a1ea3..dd580f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -15,6 +15,10 @@
         t2.name equipmentName,
         t2.model equipmentModel,
         t2.specific_equipment specificEquipment,
+        t1.fault_reason faultReason,
+        t1.fault_phenomenon faultPhenomenon,
+        t1.preventive_measure preventiveMeasure,
+        t1.fault_remove faultRemove,
         t1.fault_description faultDescription,
         t1.fault_time faultTime,
         t1.photo photo,
@@ -104,7 +108,7 @@
         LEFT JOIN  mom_eam_spare_part   t3  on  t3.id =t1.spare_part_id
         LEFT JOIN  mom_base_constructor   t4  on  t4.id =t3.constructor_id
         LEFT JOIN  mom_base_unit   t5  on  t5.id =t1.main_unit_id
-        where t1.del_flag = 0 and t1.outbound_main_quantity != 0 and  (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
+        where t1.del_flag = 0 and t3.del_flag = 0 and t1.outbound_main_quantity != 0 and  (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
         <if test="status != null and status != ''">
             and t1.status = #{status}
         </if>

--
Gitblit v1.9.3