From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
index a66abea..b7e4140 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceOrderActualMaterialMapper.xml
@@ -9,19 +9,21 @@
t1.maintenance_order_id maintenanceOrderId,
t1.equipment_id equipmentId,
t1.outbound_order_detail_id outboundOrderDetailId,
- t2.id as sparePartId,
+ t1.spare_part_id as sparePartId,
t1.quantity,
t1.is_lock isLock,
t2.num as sparePartNum,
- IFNULL(t5.use_quantity,0) as useQuantity,
- IFNULL(t5.outbound_main_quantity,0) as mainQuantity,
- (IFNULL(t5.outbound_main_quantity,0)-IFNULL(t5.use_quantity,0)) as availableQuantity,
+ ISNULL(t5.use_quantity,0) as useQuantity,
+ ISNULL(t5.outbound_main_quantity,0) as mainQuantity,
+ (ISNULL(t5.outbound_main_quantity,0)-ISNULL(t5.use_quantity,0)) as availableQuantity,
t2.name as sparePartName,
t2.model as model,
t2.specification as specification,
t3.name as mainUnitName,
t4.name as constructorName,
- t6.num num
+ t6.num num,
+ t1.smoam_uda1 smoamUda1,
+ t1.smoam_uda2 smoamUda2
FROM
mom_eam_maintenance_order_actual_material t1
LEFT JOIN mom_eam_spare_part t2 ON t1.spare_part_id = t2.id
@@ -29,7 +31,7 @@
left join mom_base_constructor t4 on t4.id = t2.constructor_id
left join mom_eam_spare_part_outbound_detail t5 on t1.outbound_order_detail_id = t5.id
left join mom_eam_spare_part_outbound t6 on t6.id = t5.spare_part_outbound_id
- WHERE t1.del_flag = 0 and t2.del_flag = 0
+ WHERE t1.del_flag = 0
<if test="params.maintenanceOrderId != null and params.maintenanceOrderId != ''">
and t1.maintenance_order_id = #{params.maintenanceOrderId}
</if>
--
Gitblit v1.9.3