From cd67e854d4715bc92a16dc7bffdbde7be1da9957 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 27 三月 2025 13:02:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/resources/mapper/manager/JamMapper.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/JamMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/JamMapper.xml
index b5b38d5..c2672cd 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/JamMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/JamMapper.xml
@@ -30,6 +30,7 @@
LEFT JOIN man_segment jam_seg ON mj.jam_seg = jam_seg.id
LEFT JOIN man_segment avo_seg ON mj.avo_seg = avo_seg.id
WHERE 1=1
+ AND mj.state != 'DEPRECATED'
AND jam_seg.state in ('INIT', 'WAITING')
AND avo_seg.state not in ('INIT', 'WAITING')
AND mj.avo_agv = #{avoAgv}
@@ -48,9 +49,25 @@
LEFT JOIN man_segment jam_seg ON mj.jam_seg = jam_seg.id
LEFT JOIN man_segment avo_seg ON mj.avo_seg = avo_seg.id
WHERE 1=1
+ AND mj.state != 'DEPRECATED'
AND avo_seg.state NOT IN ('INIT', 'WAITING')
AND mj.jam_seg = #{jamSeg}
AND mj.avo_agv = #{avoAgv}
</select>
+ <select id="selectUnfinishedAvoSegByAvo" resultType="com.zy.acs.manager.manager.entity.Jam">
+ SELECT
+ mj.*
+ FROM man_jam mj
+ LEFT JOIN man_segment jam_seg ON mj.jam_seg = jam_seg.id
+ LEFT JOIN man_segment avo_seg ON mj.avo_seg = avo_seg.id
+ WHERE 1=1
+ AND mj.state != 'DEPRECATED'
+ AND avo_seg.state IN ('INIT', 'WAITING')
+ AND mj.avo_agv = #{avoAgv}
+ <if test="currSeg != null">
+ AND mj.avo_seg = #{currSeg}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.1