提交

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

@@ -20,20 +20,22 @@ import org.springframework.web.server.ResponseStatusException;
 
 @RestController
 @RequestMapping("/api/platform/v1/last-leg/inbound-plans")
-@Tag(name = "Tail-leg inbound plans")
+@Tag(name = "尾程入仓计划")
 public class InboundPlanController {
     @Resource private InboundPlanService service;
     @Resource private InboundFbaAppointmentService appointmentService;
 
     @PostMapping("/convert")
-    @Operation(summary = "Convert one inbound order to one inbound plan")
+    /** 将入仓单转换为入仓计划。 */
+    @Operation(summary = "入仓单转入仓计划")
     public ApiResponse<InboundPlanResponse> convert(@AuthenticationPrincipal AuthenticatedUser user,
                                                     @Valid @RequestBody ConvertInboundPlanRequest request) {
         return ApiResponse.success(service.convert(scope(user, request.customerId()), request.orderId()));
     }
 
     @GetMapping("/{planNo}")
-    @Operation(summary = "Get an inbound plan with lines, pallets and allocations")
+    /** 查询入仓计划及其明细、托盘和分配信息。 */
+    @Operation(summary = "查询入仓计划详情")
     public ApiResponse<InboundPlanResponse> detail(@AuthenticationPrincipal AuthenticatedUser user,
                                                    @PathVariable String planNo,
                                                    @RequestParam(required = false) String customerId) {
@@ -41,7 +43,8 @@ public class InboundPlanController {
     }
 
     @PostMapping("/{planNo}/pallets/supplement")
-    @Operation(summary = "Add one printable supplemental pallet for a plan destination warehouse")
+    /** 为计划目标仓新增一个可打印的补充托盘。 */
+    @Operation(summary = "新增补充托盘")
     public ApiResponse<InboundPlanResponse.Pallet> supplementPallet(@AuthenticationPrincipal AuthenticatedUser user,
                                                                      @PathVariable String planNo,
                                                                      @Valid @RequestBody SupplementPalletRequest request) {
@@ -49,7 +52,8 @@ public class InboundPlanController {
     }
 
     @PostMapping("/fba-appointments/batch")
-    @Operation(summary = "Create one FBA appointment for selected inbound lines")
+    /** 为选中的入仓明细创建 FBA 预约。 */
+    @Operation(summary = "创建 FBA 预约")
     public ApiResponse<FbaAppointmentResponse> batchFbaAppointment(
         @AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody BatchFbaAppointmentRequest request) {
@@ -59,7 +63,8 @@ public class InboundPlanController {
     }
 
     @GetMapping("/fba-appointments/{appointmentNo}")
-    @Operation(summary = "Get an FBA appointment and its selected inbound lines")
+    /** 查询 FBA 预约及其选中的入仓明细。 */
+    @Operation(summary = "查询 FBA 预约详情")
     public ApiResponse<FbaAppointmentResponse> fbaAppointmentDetail(
         @AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String appointmentNo,

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundUnloadCompletedOutboxService.java

@@ -39,10 +39,11 @@ public class InboundUnloadCompletedOutboxService {
             throw new IllegalStateException("Inbound plan has no source container booking ID");
         }
         Instant photoUploadedAt = task.getUnloadPhotoUploadedAt().toInstant(ZoneOffset.UTC);
-        var payload = new OverseasContainerUnloadedV1(sourceOrder.getSourceContainerBookingId(),
-            plan.getContainerNo(), photoUploadedAt, photoUploadedAt, null);
+        var payload = new OverseasContainerUnloadedV1(plan.getContainerNo(), photoUploadedAt,
+            photoUploadedAt, null);
         JsonNode payloadNode = objectMapper.valueToTree(payload);
-        long aggregateVersion = Math.max(1, task.getVersion() == null ? 1 : task.getVersion());
+        // Multiple inbound plans can share one container; upload epoch keeps their container events ordered.
+        long aggregateVersion = photoUploadedAt.toEpochMilli();
         String eventKey = EventTypes.OVERSEAS_CONTAINER_UNLOADED + ':' + task.getId();
         String traceId = EventIdentifiers.newUuid();
         EventEnvelope envelope = new EventEnvelope(EventIdentifiers.newUuid(), EventTypes.OVERSEAS_CONTAINER_UNLOADED,