fix(lastleg): keep unconfirmed container resources recoverable

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/ContainerPlanConversionCommandMapper.java

@@ -11,6 +11,14 @@ import java.time.LocalDateTime;
 
 @Mapper
 public interface ContainerPlanConversionCommandMapper extends BaseMapper<ContainerPlanConversionCommand> {
+    // Only plans listed in this durable command are pending; older plans in the same cabinet stay confirmed.
+    String UNCONFIRMED_PLAN = "EXISTS (SELECT 1 FROM ll_container_plan_conversion_command rc " +
+        "JOIN JSON_TABLE(rc.preparation_json, '$.items[*]' COLUMNS (" +
+        "customer_id VARCHAR(20) PATH '$.customerId' ERROR ON EMPTY ERROR ON ERROR," +
+        "plan_id BIGINT PATH '$.planId' ERROR ON EMPTY ERROR ON ERROR)) resource_item " +
+        "ON resource_item.plan_id=p.id AND CAST(resource_item.customer_id AS BINARY)=CAST(p.customer_id AS BINARY) " +
+        "WHERE rc.source_container_booking_id=o.source_container_booking_id AND rc.status='LOCAL_COMMITTED')";
+
     @Select("SELECT * FROM ll_container_plan_conversion_command WHERE source_container_booking_id=#{bookingId} AND idempotency_key=#{key} LIMIT 1")
     ContainerPlanConversionCommand find(@Param("bookingId") String bookingId, @Param("key") String key);
 

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanMapper.java

@@ -49,6 +49,11 @@ public interface InboundPlanMapper extends BaseMapper<InboundPlan> {
     @Select("SELECT * FROM ll_inbound_plan WHERE customer_id=#{customerId} AND source_order_id=#{sourceOrderId} LIMIT 1")
     InboundPlan findBySourceOrder(@Param("customerId") String customerId, @Param("sourceOrderId") Long sourceOrderId);
 
+    @Select("SELECT COUNT(*) FROM ll_inbound_plan p JOIN ll_order o ON o.customer_id=p.customer_id " +
+        "AND o.id=p.source_order_id WHERE p.customer_id=#{customerId} AND p.id=#{planId} AND " +
+        ContainerPlanConversionCommandMapper.UNCONFIRMED_PLAN)
+    long countUnconfirmedResourcePlans(@Param("customerId") String customerId, @Param("planId") long planId);
+
     @Update("UPDATE ll_inbound_plan SET overseas_warehouse_id=#{warehouseId},updated_at=NOW(3) " +
         "WHERE id=#{planId} AND customer_id=#{customerId} " +
         "AND (overseas_warehouse_id IS NULL OR overseas_warehouse_id=#{warehouseId})")

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanOrderMapper.java

@@ -47,7 +47,8 @@ public interface InboundPlanOrderMapper {
         "o.detained AS detained,o.version AS version,p.plan_no AS planNo,p.status AS planStatus," +
         "p.pallet_count AS plannedPalletCount," +
         "(SELECT COUNT(*) FROM ll_inbound_plan_pallet pp WHERE pp.customer_id=p.customer_id " +
-        "AND pp.plan_id=p.id AND pp.warehouse_pallet_id IS NOT NULL) AS materializedPalletCount," +
+        "AND pp.plan_id=p.id AND pp.warehouse_pallet_id IS NOT NULL AND NOT " +
+        ContainerPlanConversionCommandMapper.UNCONFIRMED_PLAN + ") AS materializedPalletCount," +
         "(SELECT COUNT(*) FROM ll_order_source_pallet sp WHERE sp.customer_id=o.customer_id " +
         "AND sp.order_id=o.id) AS sourcePalletCount " +
         "FROM ll_order o LEFT JOIN ll_inbound_plan p ON p.customer_id=o.customer_id AND p.source_order_id=o.id " +