From 4a42e8745fe27cf8edf500eaa5b2d65e080c09b0 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 06 五月 2025 16:10:34 +0800
Subject: [PATCH] 住掉无用的仓库管理代码(防类名冲突)、start模块添加tms模块依赖
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
index afe5ce8..b7136f3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
@@ -21,8 +21,11 @@
EXISTS ( SELECT 1 FROM mdc_user_production t3 WHERE t3.user_id = #{userId} AND t3.pro_id= t2.org_id )
</otherwise>
</choose>
+ <if test="eamRepairOrder.equipmentCode != null and eamRepairOrder.equipmentCode != ''">
+ AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentCode }),'%')
+ </if>
<if test="eamRepairOrder.equipmentId != null and eamRepairOrder.equipmentId != ''">
- AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentId }),'%')
+ AND t2.id = #{ eamRepairOrder.equipmentId }
</if>
<if test="eamRepairOrder.equipmentName != null and eamRepairOrder.equipmentName != ''">
AND t2.equipment_name LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentName }),'%')
@@ -36,7 +39,10 @@
<if test="eamRepairOrder.repairCode != null and eamRepairOrder.repairCode != ''">
AND t1.repair_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.repairCode }),'%')
</if>
+ <if test="eamRepairOrder.sparePartDescription != null and eamRepairOrder.sparePartDescription != ''">
+ AND t1.spare_part_description LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.sparePartDescription }),'%')
+ </if>
</where>
- ORDER BY t1.create_time
+ ORDER BY t1.create_time DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3