From 3bfc11a94dd5b6375ead5a3a28dfc8b27211e9b7 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Mon, 10 Aug 2026 18:00:24 +0800
Subject: [PATCH] fix(firstleg): defer PDA allocation release transition

---
 .../mapper/InboundPalletAllocationMapper.java  |  9 +++++----
 .../PdaSplitSettlementSqlContractTest.java     | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundPalletAllocationMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundPalletAllocationMapper.java
index 0bb0299f5..e38ecdb2f 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundPalletAllocationMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/InboundPalletAllocationMapper.java
@@ -24,10 +24,11 @@ public interface InboundPalletAllocationMapper extends BaseMapper<InboundPalletA
     @Update("""
         UPDATE fl_inbound_pallet_allocation
            SET picked_package_count = picked_package_count + #{count},
-               allocation_status = CASE
-                 WHEN picked_package_count + #{count} = allocated_package_count THEN 'RELEASED'
-                 ELSE 'CONFIRMED'
-               END,
+               /* Keep the snapshot confirmed until the atomic warehouse release
+                  succeeds. markReleased is the single owner of this transition;
+                  changing it here makes the subsequent idempotent release update
+                  affect zero rows and surfaces as S0500 from PDA pick. */
+               allocation_status = 'CONFIRMED',
                updated_at = CURRENT_TIMESTAMP(3)
          WHERE id = #{id}
            AND tenant_id = #{tenantId}
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/PdaSplitSettlementSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/PdaSplitSettlementSqlContractTest.java
index a2c1d9287..412151a25 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/PdaSplitSettlementSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/PdaSplitSettlementSqlContractTest.java
@@ -1,6 +1,7 @@
 package com.baiyue.firstleg.repository;
 
 import com.baiyue.firstleg.mapper.InboundSplitSettlementMapper;
+import com.baiyue.firstleg.mapper.InboundPalletAllocationMapper;
 import com.baiyue.firstleg.mapper.SmartLoadingCandidateMapper;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Select;
@@ -89,4 +90,21 @@ class PdaSplitSettlementSqlContractTest {
             .getAnnotation(Update.class).value()[0];
         assertThat(markRoot).contains("process_status IN ('INBOUNDED','LOADING')");
     }
+
+    @Test
+    void keepsAllocationConfirmedUntilReleaseStep() throws Exception {
+        String consume = InboundPalletAllocationMapper.class.getMethod("consume",
+                long.class, long.class, long.class, int.class)
+            .getAnnotation(Update.class).value()[0];
+        assertThat(consume)
+            .contains("allocation_status = 'CONFIRMED'")
+            .doesNotContain("THEN 'RELEASED'");
+
+        String release = InboundPalletAllocationMapper.class.getMethod("markReleased",
+                long.class, long.class, long.class)
+            .getAnnotation(Update.class).value()[0];
+        assertThat(release)
+            .contains("allocation_status = 'RELEASED'")
+            .contains("allocation_status = 'CONFIRMED'");
+    }
 }