From 39efc87b3794f957aad73acf3a430b84e3a19b27 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 30 一月 2026 16:32:20 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
index 94eaa96..b18a435 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
+++ b/zy-acs-manager/src/main/resources/mapper/manager/StaReserveMapper.xml
@@ -18,6 +18,7 @@
<update id="updateStateToWaiting">
UPDATE man_sta_reserve
SET state = #{state},
+ segment_id = #{segmentId},
waiting_at = IFNULL(waiting_at, NOW()),
expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
@@ -31,6 +32,7 @@
<update id="updateStateBackToWaiting">
UPDATE man_sta_reserve
SET state = #{state},
+ segment_id = null,
expire_time = DATE_ADD(NOW(), INTERVAL #{extendMs} SECOND),
update_time = NOW()
WHERE task_id = #{taskId}
--
Gitblit v1.9.1