From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
index b1d1e48..fc84b6d 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
@@ -23,13 +23,38 @@
         </where>
     </sql>
 
-    <select id="getGroupNo" resultType="java.lang.String">
+    <select id="selectUsedBackpacks" resultType="java.lang.Integer">
         SELECT
-        group_id
+        DISTINCT backpack
         FROM man_segment
-        WHERE state = #{state}
+        WHERE 1=1
+        AND agv_id = #{agvId}
+        <if test="travelId != null">
+            AND travel_id = #{travelId}
+        </if>
+        AND deleted = 0
+        AND status = 1
+        AND backpack IS NOT NULL
+        AND backpack > 0
+        AND state != 'FINISH'
+        ORDER BY backpack ASC
+    </select>
+
+    <select id="getGroupNo" resultType="java.lang.String">
+        SELECT group_id
+        FROM (
+            SELECT group_id, create_time
+            FROM man_segment
+            WHERE state = #{state}
+            <if test="agvId != null">
+                AND agv_id = #{agvId}
+            </if>
+            <if test="groupNo != null">
+                AND group_id LIKE CONCAT('%', #{groupNo}, '%')
+            </if>
+            ORDER BY create_time DESC
+        ) a
         GROUP BY group_id
-        ORDER BY create_time DESC
     </select>
 
 </mapper>

--
Gitblit v1.9.1