优化

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanController.java

@@ -4,6 +4,7 @@ import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.inboundplan.dto.ConvertInboundPlanRequest;
+import com.baiyue.lastleg.inboundplan.dto.ConvertContainerInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.dto.FbaAppointmentResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
@@ -52,6 +53,18 @@ public class InboundPlanController {
         return ApiResponse.success(service.convert(convertScope(user, request.customerId()), request.orderId()));
     }
 
+    @PostMapping("/convert-container")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_CREATE + "')")
+    @Operation(summary = "按整柜批量生成入库计划", description = "平台按 sourceContainerBookingId 锁定整柜订单；每个入仓码独立生成计划，整批原子且可幂等重放。Required authority: " + OverseasPermissions.INBOUND_ORDER_CREATE)
+    public ApiResponse<java.util.List<InboundPlanResponse>> convertContainer(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody ConvertContainerInboundPlanRequest request) {
+        if (user == null || user.tenantId() == null || user.tenantId() != 0L || !"PLATFORM".equals(user.appCode())) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "仅平台账号可按整柜生成入库计划");
+        }
+        return ApiResponse.success(service.convertContainer(request.sourceContainerBookingId()));
+    }
+
     @GetMapping("/{planNo}")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_LIST + "')")
     /** 查询入仓计划及其明细、托盘和分配信息。 */

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/ConvertContainerInboundPlanRequest.java

@@ -0,0 +1,10 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+/** 平台按来源头程柜预订身份批量生成入库计划。 */
+public record ConvertContainerInboundPlanRequest(
+    @NotBlank @Size(max = 128) String sourceContainerBookingId
+) {
+}

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

@@ -12,6 +12,12 @@ import java.util.List;
 
 @Mapper
 public interface InboundPlanOrderMapper {
+    record ContainerOrderRef(String customerId, Long orderId, String currentStatus) { }
+
+    @Select("SELECT customer_id AS customerId,id AS orderId,current_status AS currentStatus " +
+        "FROM ll_order WHERE source_container_booking_id=#{sourceContainerBookingId} ORDER BY customer_id,id FOR UPDATE")
+    List<ContainerOrderRef> lockContainerOrders(@Param("sourceContainerBookingId") String sourceContainerBookingId);
+
     @Select("SELECT container_no FROM ll_order WHERE customer_id=#{customerId} AND id=#{orderId} LIMIT 1")
     String findContainerNo(@Param("customerId") String customerId, @Param("orderId") Long orderId);
 

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java

@@ -121,6 +121,30 @@ public class InboundPlanService {
         return detail(customerId, plan);
     }
 
+    /** 同一来源柜的每个尾程订单独立建计划；整个柜级批次共用一个事务。 */
+    @Transactional
+    public List<InboundPlanResponse> convertContainer(String sourceContainerBookingId) {
+        String bookingId = trimToNull(sourceContainerBookingId);
+        if (bookingId == null) throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "来源柜预订 ID 不能为空");
+        List<InboundPlanOrderMapper.ContainerOrderRef> refs = orderMapper.lockContainerOrders(bookingId);
+        if (refs.isEmpty()) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "来源柜没有尾程订单");
+        boolean hasEligible = refs.stream().anyMatch(ref -> "PENDING_ASSIGNMENT".equals(ref.currentStatus())
+            || "DESTINATION_ASSIGNED".equals(ref.currentStatus()));
+        if (!hasEligible) {
+            List<InboundPlanResponse> replay = refs.stream().map(ref -> {
+                InboundPlan existing = planMapper.findBySourceOrder(ref.customerId(), ref.orderId());
+                if (existing == null) throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜转换状态不一致");
+                return detail(ref.customerId(), existing);
+            }).toList();
+            return replay;
+        }
+        if (refs.stream().anyMatch(ref -> !("PENDING_ASSIGNMENT".equals(ref.currentStatus())
+            || "DESTINATION_ASSIGNED".equals(ref.currentStatus())))) {
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "来源柜存在不能转换的尾程订单");
+        }
+        return refs.stream().map(ref -> convert(ref.customerId(), ref.orderId())).toList();
+    }
+
 
     @Transactional(readOnly = true)
     public InboundPlanResponse detailByPlanNo(String customerId, String planNo) {