From c6d7fb0d84d1bf643131c0bd48321f12eb7439c1 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Sat, 15 Aug 2026 10:09:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/baiyue/firstleg/service/LoadingPickService.java | 3 +-- .../main/resources/openapi/phase3-pda-convergence-v1.yaml | 2 +- .../controller/PdaConvergenceOpenApiContractTest.java | 2 +- .../com/baiyue/firstleg/service/LoadingPickServiceTest.java | 6 +----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java index 75818b687..daa6ea89b 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/service/LoadingPickService.java @@ -584,10 +584,9 @@ public class LoadingPickService { .filter(value -> detailInboundId.equals(value.inboundId())).findFirst().orElse(null); var inbound = owner == null || owner.tenantId() == null || owner.inboundId() == null ? null : repository.inbound(owner.tenantId(), owner.inboundId()); - var plan = smartLoadingRepository.plan(task.getLoadingPlanId()); return new Task(task.getId(), task.getLoadingPlanId(), task.getContainerBookingId(), owner == null ? null : owner.inboundId(), inbound == null ? null : inbound.version(), - plan == null ? null : plan.getVersion(), task.getCabinetNo(), + inbound == null ? null : inbound.version(), task.getCabinetNo(), booking == null ? null : booking.getContainerNo(), task.getTaskStatus(), workflowStatus, task.getVersion(), assignment, review, items); } diff --git a/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml b/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml index cbbc5361e..9b4b96c52 100644 --- a/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml +++ b/firstleg/src/main/resources/openapi/phase3-pda-convergence-v1.yaml @@ -131,7 +131,7 @@ components: containerBookingId: {type: integer, format: int64} inboundId: {type: integer, format: int64, description: Stable inbound identity selected from the task item; evidence identity is taskId+inboundId+loadingPlanId+containerBookingId} inboundVersion: {type: integer, minimum: 0, description: Current fl_inbound_order.version for inboundId; never inferred from PDA task version} - loadingVersion: {type: integer, minimum: 0, description: Current fl_loading_plan.version for loadingPlanId; used as the loading/evidence concurrency snapshot} + loadingVersion: {type: integer, minimum: 0, description: Compatibility alias of inboundVersion from the same fl_inbound_order row; /loading/complete uses this inbound loading-stage version} cabinetNo: {type: string} currentContainerNo: {type: string, nullable: true, description: Mutable transport display field; changing it never resynchronizes the task or item versions and it is never task identity} taskStatus: {type: string, enum: [LOADING, COMPLETED]} diff --git a/firstleg/src/test/java/com/baiyue/firstleg/controller/PdaConvergenceOpenApiContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/controller/PdaConvergenceOpenApiContractTest.java index 36b97fa8c..64c03a7fa 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/controller/PdaConvergenceOpenApiContractTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/controller/PdaConvergenceOpenApiContractTest.java @@ -35,7 +35,7 @@ class PdaConvergenceOpenApiContractTest { .contains("without using containerNo as an association key") .contains("evidence identity is taskId+inboundId+loadingPlanId+containerBookingId") .contains("Current fl_inbound_order.version for inboundId") - .contains("Current fl_loading_plan.version for loadingPlanId") + .contains("Compatibility alias of inboundVersion from the same fl_inbound_order row") .contains("CompleteLoadingRequest"); String taskLookup = yaml.substring( diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java index 54e07def4..81ace047a 100644 --- a/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java +++ b/firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java @@ -242,15 +242,11 @@ class LoadingPickServiceTest { new LoadingPickItemMapper.InboundOwner(101L, 50L))); when(repository.inbound(101L, 50L)).thenReturn( new LoadingInboundMapper.Snapshot(50L, 101L, "LOADING", 7)); - var plan = new com.baiyue.firstleg.entity.LoadingPlanEntity(); - plan.setId(10L); plan.setVersion(11); - when(smartLoadingRepository.plan(10L)).thenReturn(plan); - var result = service.task(20L, 101L); assertThat(result.inboundId()).isEqualTo(50L); assertThat(result.inboundVersion()).isEqualTo(7); - assertThat(result.loadingVersion()).isEqualTo(11); + assertThat(result.loadingVersion()).isEqualTo(7); assertThat(result.loadingPlanId()).isEqualTo(10L); assertThat(result.containerBookingId()).isEqualTo(99L); }