入库修改

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

@@ -0,0 +1,34 @@
+package com.baiyue.lastleg.inboundplan.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baiyue.lastleg.inboundplan.entity.InboundPlanCarton;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface InboundPlanCartonMapper extends BaseMapper<InboundPlanCarton> {
+    @Select("""
+        SELECT l.* FROM ll_inbound_plan_line l
+          JOIN ll_order_detail d ON d.order_id=l.order_id
+         WHERE l.plan_id=#{planId}
+           AND d.source_inbound_detail_id=#{sourceInboundDetailId}
+         LIMIT 1
+        """)
+    com.baiyue.lastleg.inboundplan.entity.InboundPlanLine findPlanLine(@Param("planId") Long planId,
+                                                                        @Param("sourceInboundDetailId") String sourceInboundDetailId);
+
+    @Select("""
+        SELECT COUNT(*) FROM ll_inbound_plan_carton
+         WHERE plan_id=#{planId} AND line_id=#{lineId} AND status='ON_PALLET'
+        """)
+    long scannedCount(@Param("planId") Long planId, @Param("lineId") Long lineId);
+
+    @Select("""
+        SELECT EXISTS(SELECT 1 FROM ll_inbound_plan_line l
+          JOIN ll_order_detail d ON d.order_id=l.order_id
+          JOIN ll_inbound_plan_carton c ON c.source_inbound_detail_id=d.source_inbound_detail_id
+         WHERE l.plan_id=#{planId})
+        """)
+    boolean hasLabelPool(@Param("planId") Long planId);
+}

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

@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface InboundPlanMapper extends BaseMapper<InboundPlan> {
-    @Select("SELECT * FROM ll_inbound_plan WHERE customer_id=#{customerId} AND container_no=#{containerNo} LIMIT 1")
-    InboundPlan findByContainer(@Param("customerId") String customerId, @Param("containerNo") String containerNo);
+    @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);
 }

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

@@ -29,12 +29,12 @@ public interface InboundPlanOrderMapper {
         "<> COALESCE(NULLIF(o.transfer_warehouse_id,''),NULLIF(o.transfer_warehouse_code,'')) THEN 1 ELSE 0 END) " +
         "AS destinationMismatchCount " +
         "FROM ll_order o LEFT JOIN ll_order_detail d ON d.order_id=o.id " +
-        "WHERE o.customer_id=#{customerId} AND o.container_no=#{containerNo} " +
+        "WHERE o.customer_id=#{customerId} AND o.id=#{orderId} " +
         "GROUP BY o.id,o.customer_id,o.container_no,o.inbound_code,o.current_status,o.inbound_order_no,o.volume_cbm,o.package_count,o.fba_warehouse_code," +
         "o.transfer_warehouse_id,o.transfer_warehouse_code,o.transfer_warehouse_name " +
         "ORDER BY o.id FOR UPDATE")
-    List<SourceOrderSnapshot> lockContainerOrders(@Param("customerId") String customerId,
-                                                   @Param("containerNo") String containerNo);
+    List<SourceOrderSnapshot> lockOrder(@Param("customerId") String customerId,
+                                        @Param("orderId") Long orderId);
 
     @Update("UPDATE ll_order SET inbound_order_no=#{planNo},current_status='INBOUND_PLANNED'," +
         "pallet_merge_flag='MERGED',pallet_count=#{palletCount},updated_at=#{updatedAt} " +