From 62a60e8fae9b0aae5214201ca2963b98868c2fb6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 三月 2026 10:32:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/JamMapper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/JamMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/JamMapper.java
index 676d2f4..79bc636 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/JamMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/JamMapper.java
@@ -12,4 +12,6 @@
 
     List<Jam> selectJamFromSegmentByAvo(@Param("jamSeg")Long jamSeg, @Param("avoAgv")Long avoAgv);
 
+    List<Jam> selectUnfinishedAvoSegByAvo(@Param("avoAgv")Long avoAgv, @Param("currSeg")Long currSeg);
+
 }

--
Gitblit v1.9.1