From ee97565f67e4cc9a986ebc8a3da19ceb6b7fda06 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 13:51:06 +0800
Subject: [PATCH 01/26] fix: paginate dropship pallet print details

---
 .../InboundCartonLabelPrintService.java       | 33 ++++++++++++++--
 .../InboundCartonLabelPrintServiceTest.java   | 38 +++++++++++++++++++
 .../controller/PrintRequestSizeFilter.java    |  1 +
 .../PrintRequestSizeFilterTest.java           | 11 ++++++
 4 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
index 8b2e7c047..e3148d064 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
@@ -32,6 +32,8 @@ public class InboundCartonLabelPrintService {
     private static final BigDecimal PAGE_MM = new BigDecimal("100");
     private static final BigDecimal A4_WIDTH_MM = new BigDecimal("210");
     private static final BigDecimal A4_HEIGHT_MM = new BigDecimal("297");
+    private static final int DROPSHIP_INBOUND_ROWS_PER_PAGE = 10;
+    private static final int DROPSHIP_SKU_ROWS_PER_PAGE = 34;
     private static final List<String> SAFE_RESPONSE_HEADERS = List.of(
         HttpHeaders.CONTENT_DISPOSITION, HttpHeaders.CACHE_CONTROL, HttpHeaders.PRAGMA,
         "X-Print-Page-Count", "X-Request-Id", "X-Trace-Id");
@@ -134,7 +136,7 @@ public class InboundCartonLabelPrintService {
         }
         Map<Long, String> customerNicknameCache = new HashMap<>();
         List<PrintPdfClient.DropshipPalletDocument> documents = pallets.stream()
-            .map(pallet -> dropshipPalletDocument(pallet, customerNicknameCache)).toList();
+            .flatMap(pallet -> dropshipPalletDocuments(pallet, customerNicknameCache).stream()).toList();
         String fileName = pallets.size() == 1
             ? pallets.get(0).palletNo() + "-A4托盘信息单.pdf"
             : inboundCode + "-" + pallets.size() + "托-A4托盘信息单.pdf";
@@ -148,7 +150,7 @@ public class InboundCartonLabelPrintService {
         }
     }
 
-    private PrintPdfClient.DropshipPalletDocument dropshipPalletDocument(
+    private List<PrintPdfClient.DropshipPalletDocument> dropshipPalletDocuments(
         Pallet pallet, Map<Long, String> customerNicknameCache) {
         if (pallet == null || pallet.palletId() == null || !StringUtils.hasText(pallet.palletNo())) {
             throw new BizException(ResultCode.CONFLICT, "托盘码尚未生成，不能打印");
@@ -172,8 +174,31 @@ public class InboundCartonLabelPrintService {
             .stream().map(row -> new PrintPdfClient.DropshipPalletSkuRow(
                 row.getSkuCode(), number(row.getCartonCount()), number(row.getItemQuantity()),
                 unitsPerCarton(row))).toList();
-        return new PrintPdfClient.DropshipPalletDocument(
-            pallet.palletNo(), destinationWarehouse, pallet.palletNo(), inboundRows, skuRows);
+        int pageCount = Math.max(1, Math.max(pageCount(inboundRows.size(), DROPSHIP_INBOUND_ROWS_PER_PAGE),
+            pageCount(skuRows.size(), DROPSHIP_SKU_ROWS_PER_PAGE)));
+        List<PrintPdfClient.DropshipPalletDocument> documents = new ArrayList<>(pageCount);
+        for (int page = 0; page < pageCount; page++) {
+            documents.add(new PrintPdfClient.DropshipPalletDocument(
+                pallet.palletNo(), destinationWarehouse, pallet.palletNo(),
+                pageOrRepeat(inboundRows, page, DROPSHIP_INBOUND_ROWS_PER_PAGE),
+                page(skuRows, page, DROPSHIP_SKU_ROWS_PER_PAGE)));
+        }
+        return List.copyOf(documents);
+    }
+
+    private int pageCount(int size, int pageSize) {
+        return size == 0 ? 0 : (size + pageSize - 1) / pageSize;
+    }
+
+    private <T> List<T> page(List<T> rows, int page, int pageSize) {
+        int from = Math.min(rows.size(), page * pageSize);
+        int to = Math.min(rows.size(), from + pageSize);
+        return rows.subList(from, to);
+    }
+
+    private <T> List<T> pageOrRepeat(List<T> rows, int page, int pageSize) {
+        List<T> selected = page(rows, page, pageSize);
+        return selected.isEmpty() ? page(rows, 0, pageSize) : selected;
     }
 
     private String unitsPerCarton(DropshipPalletizationMapper.PrintSkuRow row) {
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
index a9f25abe4..ec288a2f8 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
@@ -18,6 +18,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -108,6 +109,43 @@ class InboundCartonLabelPrintServiceTest {
         assertThat(response.getBody()).containsExactly(4, 5, 6);
     }
 
+    @Test
+    void splitsLargeDropshipPalletDetailsAcrossPrintableA4Pages() {
+        Pallet pallet = dropshipPallet("OPEN");
+        stubPalletFacts(90001L);
+        List<DropshipPalletizationMapper.PrintSkuRow> skuRows = new ArrayList<>();
+        for (int index = 1; index <= 35; index++) {
+            DropshipPalletizationMapper.PrintSkuRow row = new DropshipPalletizationMapper.PrintSkuRow();
+            row.setSkuCode("SKU-" + index);
+            row.setCartonCount(1);
+            row.setItemQuantity(index);
+            row.setMinUnitsPerCarton(index);
+            row.setMaxUnitsPerCarton(index);
+            skuRows.add(row);
+        }
+        when(palletization.printSkuRows(90001L)).thenReturn(skuRows);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
+        when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
+            org.mockito.ArgumentMatchers.eq("request-large"), org.mockito.ArgumentMatchers.any()))
+            .thenReturn(new ResponseEntity<>(new byte[] {1}, headers,
+                org.springframework.http.HttpStatus.OK));
+
+        service.generateDropshipPallet(pallet, "PCHK2608040174", "request-large");
+
+        ArgumentCaptor<PrintPdfClient.DropshipPalletA4PdfRequest> request =
+            ArgumentCaptor.forClass(PrintPdfClient.DropshipPalletA4PdfRequest.class);
+        verify(print).generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.eq("internal-token"),
+            org.mockito.ArgumentMatchers.eq("request-large"), request.capture());
+        assertThat(request.getValue().documents()).hasSize(2).allSatisfy(document -> {
+            assertThat(document.palletNo()).isEqualTo("DP-260911-0001");
+            assertThat(document.inboundRows()).isNotEmpty().hasSizeLessThanOrEqualTo(10);
+            assertThat(document.skuRows()).hasSizeLessThanOrEqualTo(34);
+        });
+        assertThat(request.getValue().documents().get(0).skuRows()).hasSize(34);
+        assertThat(request.getValue().documents().get(1).skuRows()).hasSize(1);
+    }
+
     @Test
     void forwardsStableLabelsWithoutSkuAndOnlySafePdfHeaders() throws Exception {
         when(labels.list(10001L, 70001L, List.of(1))).thenReturn(batch());
diff --git a/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java b/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
index 00215973d..c6c4a9375 100644
--- a/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
+++ b/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
@@ -31,6 +31,7 @@ public class PrintRequestSizeFilter extends OncePerRequestFilter {
     private static final java.util.Set<String> PATHS = java.util.Set.of(
             "/internal/print/v1/pdfs/inbound-marks",
             "/internal/print/v1/pdfs/fba-pallet-labels",
+            "/internal/print/v1/pdfs/dropship-pallet-a4-documents",
             "/internal/print/v1/pdfs/freight-a4-documents");
 
     @Resource private PrintPdfProperties properties;
diff --git a/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java b/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
index 2e24244e3..0ed8c97fc 100644
--- a/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
+++ b/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
@@ -62,6 +62,17 @@ class PrintRequestSizeFilterTest {
         assertTooLarge(response);
     }
 
+    @Test
+    void capsDropshipPalletRequestsBeforeDeserialization() throws Exception {
+        var response = new MockHttpServletResponse();
+        AtomicReference<Boolean> called = new AtomicReference<>(false);
+        filter.doFilter(request("12345678901", true,
+            "/internal/print/v1/pdfs/dropship-pallet-a4-documents"), response,
+            (ignoredRequest, ignoredResponse) -> called.set(true));
+        assertThat(called).hasValue(false);
+        assertTooLarge(response);
+    }
+
     @Test
     void rejectsOversizedDeclaredContentLengthWithoutCallingDownstream() throws Exception {
         MockHttpServletRequest request = new MockHttpServletRequest() {

From 493d62e04ca0db7a8f8e92e959e648febc8b95f6 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:05:00 +0800
Subject: [PATCH 02/26] fix: keep pallet labels on A4 templates

---
 print/AGENTS.md                               |  3 +-
 .../controller/InternalPdfController.java     | 16 +++++
 .../controller/PrintRequestSizeFilter.java    |  1 +
 .../print/dto/GenericPalletPdfDtos.java       | 13 ++++
 .../print/renderer/GenericPalletRenderer.java | 43 ++++++++++++
 .../service/GenericPalletPdfService.java      | 70 +++++++++++++++++++
 .../resources/openapi/print-internal-v1.yaml  | 41 +++++++++++
 .../controller/InternalPdfControllerTest.java |  5 ++
 .../PrintRequestSizeFilterTest.java           | 10 +++
 ...GenericPalletPdfServiceGenerationTest.java | 43 ++++++++++++
 warehouse-overseas-service/AGENTS.md          |  2 +-
 .../warehouse/client/PrintPdfClient.java      | 11 +--
 .../service/PalletLabelPrintService.java      | 11 ++-
 .../resources/openapi/pallet-label-v1.yaml    |  2 +-
 .../service/PalletLabelPrintServiceTest.java  | 25 +++----
 15 files changed, 269 insertions(+), 27 deletions(-)
 create mode 100644 print/src/main/java/com/baiyue/print/dto/GenericPalletPdfDtos.java
 create mode 100644 print/src/main/java/com/baiyue/print/renderer/GenericPalletRenderer.java
 create mode 100644 print/src/main/java/com/baiyue/print/service/GenericPalletPdfService.java
 create mode 100644 print/src/test/java/com/baiyue/print/service/GenericPalletPdfServiceGenerationTest.java

diff --git a/print/AGENTS.md b/print/AGENTS.md
index 28efab4c8..0e81b655c 100644
--- a/print/AGENTS.md
+++ b/print/AGENTS.md
@@ -5,7 +5,7 @@
 - 本模块是无数据库的无状态 PDF 渲染服务；调用方传入完整 `labels[]` 或 `documents[]`，模块在内存中生成一次性多页 PDF 并同步返回。
 - 不保存模板、任务、历史或文件，不连接数据库、File 服务或打印机，不反查或修正业务数据。
 - `INBOUND_MARK_V1` 箱唛不接收或展示 SKU（包括一件代发箱唛），二维码仅编码稳定箱码；SKU 明细由一件代发 A4 托盘信息单展示，不能重新加入箱唛版面。
-- 当前支持 `INBOUND_MARK_V1`（100×100 mm）、`FBA_PALLET_A4_LANDSCAPE_V1`（297×210 mm），以及纵向 A4 的 `DROPSHIP_PALLET_A4_V2`、`SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1`、`BILL_OF_LADING_CONFIRMATION_A4_V1`、`DISPATCH_BILL_OF_LADING_A4_V2`。FBA 模板由国内和海外统一使用，每托一页，只展示 SCK8 等 FBA 仓码、完整托盘号的 Code 128 条码和完整托盘号；141 等内部编号保留在托盘号中。一件代发每托一页，展示托盘 Code 128、目的仓、最多 10 行入仓码/客户昵称和最多 34 行 SKU，不展示状态、重量或体积。新尺寸或布局必须使用新模板编码。
+- 当前只有箱唛 `INBOUND_MARK_V1` 使用 100×100 mm；托盘标不得复用该模板。横向 A4 托盘模板包括 `FBA_PALLET_A4_LANDSCAPE_V1` 与 `PALLET_A4_LANDSCAPE_V1`，纵向 A4 包括 `DROPSHIP_PALLET_A4_V2`，其他 A4 单据为 `SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1`、`BILL_OF_LADING_CONFIRMATION_A4_V1`、`DISPATCH_BILL_OF_LADING_A4_V2`。FBA 模板由国内和海外统一使用，每托一页，只展示 SCK8 等 FBA 仓码、完整托盘号的 Code 128 条码和完整托盘号；141 等内部编号保留在托盘号中。一件代发展示托盘 Code 128、目的仓、每页最多 10 行入仓码/客户昵称和 34 行 SKU，超量由调用方按同一托盘自动续页，不展示状态、重量或体积。新尺寸或布局必须使用新模板编码。
 
 ## 快速索引
 
@@ -13,6 +13,7 @@
 |---|---|
 | 调用方接入指南 | `README.md` |
 | 国内/海外统一 FBA 托盘标 | `dto/FbaPalletPdfDtos.java`、`service/FbaPalletPdfService.java`、`renderer/FbaPalletRenderer.java`；内部 `/internal/print/v1/pdfs/fba-pallet-labels`，回归 `src/test/java/com/baiyue/print/service/FbaPalletPdfServiceTest.java` |
+| 非 FBA 通用托盘标 | `dto/GenericPalletPdfDtos.java`、`service/GenericPalletPdfService.java`、`renderer/GenericPalletRenderer.java`；内部 `/internal/print/v1/pdfs/pallet-a4-labels` |
 | 应用入口 | `src/main/java/com/baiyue/print/PrintServiceApplication.java` |
 | 健康状态 API | `controller/PrintHealthController.java`（`/api/platform/v1/print/status`） |
 | 内部 PDF API | `controller/InternalPdfController.java`（`/internal/print/v1/pdfs/inbound-marks`、`/internal/print/v1/pdfs/dropship-pallet-a4-documents`、`/internal/print/v1/pdfs/freight-a4-documents`） |
diff --git a/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java b/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
index 73caf2a75..ec8cdeaa8 100644
--- a/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
+++ b/print/src/main/java/com/baiyue/print/controller/InternalPdfController.java
@@ -5,7 +5,9 @@ import jakarta.annotation.Resource;
 import com.baiyue.common.web.CorrelationContext;
 import com.baiyue.print.dto.FreightA4PdfDtos;
 import com.baiyue.print.dto.FbaPalletPdfDtos;
+import com.baiyue.print.dto.GenericPalletPdfDtos;
 import com.baiyue.print.service.FbaPalletPdfService;
+import com.baiyue.print.service.GenericPalletPdfService;
 import com.baiyue.print.dto.DispatchBolPdfDtos;
 import com.baiyue.print.dto.DropshipPalletA4PdfDtos;
 import com.baiyue.print.dto.InboundMarkPdfDtos;
@@ -39,6 +41,7 @@ public class InternalPdfController {
     @Resource private DispatchBolPdfService dispatchBolPdfService;
     @Resource private DropshipPalletA4PdfService dropshipPalletA4PdfService;
     @Resource private FbaPalletPdfService fbaPalletPdfService;
+    @Resource private GenericPalletPdfService genericPalletPdfService;
     @Resource private InternalServiceTokenGuard tokenGuard;
 
     @PostMapping(value = "/fba-pallet-labels", consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -54,6 +57,19 @@ public class InternalPdfController {
                 .contentType(MediaType.APPLICATION_PDF).contentLength(content.length).body(content);
     }
 
+    @PostMapping(value = "/pallet-a4-labels", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<byte[]> generatePalletA4Labels(
+            @RequestHeader(value = INTERNAL_TOKEN_HEADER, required = false) String internalToken,
+            @Valid @RequestBody GenericPalletPdfDtos.Request request) {
+        tokenGuard.verify(internalToken);
+        GenericPalletPdfService.GeneratedPdf pdf = genericPalletPdfService.generate(request);
+        byte[] content = pdf.content();
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore()).header(HttpHeaders.PRAGMA, "no-cache")
+                .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment().filename(pdf.fileName(), StandardCharsets.UTF_8).build().toString())
+                .header("X-Content-Type-Options", "nosniff").header(PAGE_COUNT_HEADER, Integer.toString(pdf.pageCount()))
+                .contentType(MediaType.APPLICATION_PDF).contentLength(content.length).body(content);
+    }
+
     @PostMapping(value = "/inbound-marks", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<byte[]> generateInboundMarks(
             @RequestHeader(value = INTERNAL_TOKEN_HEADER, required = false) String internalToken,
diff --git a/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java b/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
index c6c4a9375..2d726108b 100644
--- a/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
+++ b/print/src/main/java/com/baiyue/print/controller/PrintRequestSizeFilter.java
@@ -31,6 +31,7 @@ public class PrintRequestSizeFilter extends OncePerRequestFilter {
     private static final java.util.Set<String> PATHS = java.util.Set.of(
             "/internal/print/v1/pdfs/inbound-marks",
             "/internal/print/v1/pdfs/fba-pallet-labels",
+            "/internal/print/v1/pdfs/pallet-a4-labels",
             "/internal/print/v1/pdfs/dropship-pallet-a4-documents",
             "/internal/print/v1/pdfs/freight-a4-documents");
 
diff --git a/print/src/main/java/com/baiyue/print/dto/GenericPalletPdfDtos.java b/print/src/main/java/com/baiyue/print/dto/GenericPalletPdfDtos.java
new file mode 100644
index 000000000..c990eecef
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/dto/GenericPalletPdfDtos.java
@@ -0,0 +1,13 @@
+package com.baiyue.print.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public final class GenericPalletPdfDtos {
+    public static final String TEMPLATE = "PALLET_A4_LANDSCAPE_V1";
+    private GenericPalletPdfDtos() {}
+
+    public record Request(String templateCode, PageSpec pageSpec, String downloadFileName, List<Label> labels) {}
+    public record PageSpec(BigDecimal widthMm, BigDecimal heightMm) {}
+    public record Label(String heading, String reference, String palletCode) {}
+}
diff --git a/print/src/main/java/com/baiyue/print/renderer/GenericPalletRenderer.java b/print/src/main/java/com/baiyue/print/renderer/GenericPalletRenderer.java
new file mode 100644
index 000000000..65e0ba450
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/renderer/GenericPalletRenderer.java
@@ -0,0 +1,43 @@
+package com.baiyue.print.renderer;
+
+import com.baiyue.print.dto.GenericPalletPdfDtos;
+import com.google.zxing.common.BitMatrix;
+import jakarta.annotation.Resource;
+import java.io.IOException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GenericPalletRenderer {
+    @Resource private PdfBarcodeRenderer barcodeRenderer;
+
+    public void renderPage(PDDocument pdf, PDFont font, GenericPalletPdfDtos.Label label, BitMatrix barcode)
+            throws IOException {
+        PDPage page = new PDPage(new PDRectangle(PdfUnits.mmToPt(297), PdfUnits.mmToPt(210)));
+        pdf.addPage(page);
+        PdfUnits units = new PdfUnits(210);
+        try (PDPageContentStream stream = new PDPageContentStream(pdf, page)) {
+            centered(stream, units, font, label.heading(), 80, 43);
+            centered(stream, units, font, label.reference(), 30, 76);
+            barcodeRenderer.draw(stream, barcode, PdfUnits.mmToPt(33.5), units.topDownMmToPdfY(145),
+                PdfUnits.mmToPt(230), PdfUnits.mmToPt(34));
+            centered(stream, units, font, label.palletCode(), 58, 175);
+        }
+    }
+
+    private void centered(PDPageContentStream stream, PdfUnits units, PDFont font, String value,
+                          float preferredSize, double centerY) throws IOException {
+        float unitWidth = font.getStringWidth(value) / 1000;
+        float size = Math.min(preferredSize, PdfUnits.mmToPt(267) / unitWidth);
+        stream.beginText();
+        stream.setFont(font, size);
+        stream.newLineAtOffset((PdfUnits.mmToPt(297) - unitWidth * size) / 2,
+            units.centeredTextBaseline(font, size, centerY));
+        stream.showText(value);
+        stream.endText();
+    }
+}
diff --git a/print/src/main/java/com/baiyue/print/service/GenericPalletPdfService.java b/print/src/main/java/com/baiyue/print/service/GenericPalletPdfService.java
new file mode 100644
index 000000000..6b8d3d80e
--- /dev/null
+++ b/print/src/main/java/com/baiyue/print/service/GenericPalletPdfService.java
@@ -0,0 +1,70 @@
+package com.baiyue.print.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.GenericPalletPdfDtos;
+import com.baiyue.print.renderer.GenericPalletRenderer;
+import com.baiyue.print.renderer.PdfBarcodeRenderer;
+import jakarta.annotation.Resource;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.util.Locale;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.font.PDType0Font;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GenericPalletPdfService {
+    @Resource private PrintPdfProperties properties;
+    @Resource private PdfGenerationLimiter limiter;
+    @Resource private GenericPalletRenderer renderer;
+    @Resource private PdfBarcodeRenderer barcodeRenderer;
+
+    public GeneratedPdf generate(GenericPalletPdfDtos.Request request) {
+        validate(request);
+        try (PdfGenerationLimiter.Permit ignored = limiter.acquire(); PDDocument pdf = new PDDocument();
+             InputStream fontStream = new ClassPathResource(properties.getFontResource()).getInputStream();
+             ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            PDType0Font font = PDType0Font.load(pdf, fontStream, true);
+            for (var label : request.labels()) {
+                renderer.renderPage(pdf, font, label, barcodeRenderer.encode(label.palletCode()));
+            }
+            pdf.save(output);
+            byte[] content = output.toByteArray();
+            if (content.length > properties.getMaxOutputBytes()) invalid("生成的 PDF 超过输出大小上限");
+            return new GeneratedPdf(content, request.downloadFileName(), request.labels().size());
+        } catch (IOException exception) {
+            throw new BizException(ResultCode.INTERNAL_ERROR, "PDF 生成失败");
+        }
+    }
+
+    private void validate(GenericPalletPdfDtos.Request request) {
+        if (request == null || !GenericPalletPdfDtos.TEMPLATE.equals(request.templateCode())) invalid("templateCode is not supported");
+        if (request.pageSpec() == null || request.pageSpec().widthMm() == null || request.pageSpec().heightMm() == null
+                || request.pageSpec().widthMm().compareTo(new BigDecimal("297")) != 0
+                || request.pageSpec().heightMm().compareTo(new BigDecimal("210")) != 0) invalid("pageSpec must be landscape A4 (297 x 210 mm)");
+        String fileName = request.downloadFileName();
+        if (fileName == null || fileName.isBlank() || fileName.length() > 120
+                || !fileName.toLowerCase(Locale.ROOT).endsWith(".pdf")
+                || fileName.matches(".*[\\\\/:*?\"<>|].*")
+                || fileName.codePoints().anyMatch(Character::isISOControl)) invalid("downloadFileName is invalid");
+        if (request.labels() == null || request.labels().isEmpty() || request.labels().size() > properties.getMaxPages()) invalid("labels count is invalid");
+        for (var label : request.labels()) {
+            if (label == null || !text(label.heading(), 80) || !text(label.reference(), 80)) invalid("heading and reference are required");
+            if (label.palletCode() == null || label.palletCode().isBlank()
+                    || !label.palletCode().equals(label.palletCode().strip())
+                    || !label.palletCode().matches("[\\x20-\\x7E]{1,80}")) invalid("palletCode must contain 1-80 printable ASCII characters without surrounding spaces");
+        }
+    }
+
+    private boolean text(String value, int max) {
+        return value != null && !value.isBlank() && value.codePointCount(0, value.length()) <= max
+            && value.codePoints().noneMatch(Character::isISOControl);
+    }
+    private void invalid(String message) { throw new BizException(ResultCode.VALIDATION_FAILED, message); }
+    public record GeneratedPdf(byte[] content, String fileName, int pageCount) {}
+}
diff --git a/print/src/main/resources/openapi/print-internal-v1.yaml b/print/src/main/resources/openapi/print-internal-v1.yaml
index e1cafe15c..7ba271bb3 100644
--- a/print/src/main/resources/openapi/print-internal-v1.yaml
+++ b/print/src/main/resources/openapi/print-internal-v1.yaml
@@ -4,6 +4,24 @@ info:
   version: 1.0.0
   description: Internal stateless PDF rendering API. This path must not be exposed through Gateway.
 paths:
+  /internal/print/v1/pdfs/pallet-a4-labels:
+    post:
+      summary: Generate non-FBA pallet labels as landscape A4 pages
+      operationId: generatePalletA4Labels
+      security: [{ internalServiceToken: [] }]
+      parameters: [{ $ref: '#/components/parameters/RequestId' }]
+      requestBody:
+        required: true
+        content: { application/json: { schema: { $ref: '#/components/schemas/GenericPalletPdfRequest' } } }
+      responses:
+        '200':
+          description: PDF generation succeeded, or a business error was returned as ApiResponse JSON.
+          content:
+            application/pdf: { schema: { type: string, format: binary } }
+            application/json: { schema: { $ref: '#/components/schemas/ApiError' } }
+        '413':
+          description: Request body exceeds the configured limit.
+          content: { application/json: { schema: { $ref: '#/components/schemas/ApiError' } } }
   /internal/print/v1/pdfs/fba-pallet-labels:
     post:
       summary: Generate shared domestic and overseas FBA pallet labels as landscape A4 pages
@@ -176,6 +194,29 @@ components:
       schema:
         type: string
   schemas:
+    GenericPalletPdfRequest:
+      type: object
+      required: [templateCode, pageSpec, downloadFileName, labels]
+      properties:
+        templateCode: { type: string, enum: [PALLET_A4_LANDSCAPE_V1] }
+        pageSpec:
+          type: object
+          required: [widthMm, heightMm]
+          properties:
+            widthMm: { type: number, enum: [297] }
+            heightMm: { type: number, enum: [210] }
+        downloadFileName: { type: string, minLength: 4, maxLength: 120 }
+        labels:
+          type: array
+          minItems: 1
+          maxItems: 2000
+          items:
+            type: object
+            required: [heading, reference, palletCode]
+            properties:
+              heading: { type: string, minLength: 1, maxLength: 80 }
+              reference: { type: string, minLength: 1, maxLength: 80 }
+              palletCode: { type: string, minLength: 1, maxLength: 80, pattern: '^[\x20-\x7E]+$' }
     FbaPalletPdfRequest:
       type: object
       required: [templateCode, pageSpec, downloadFileName, labels]
diff --git a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
index 6e6b3cd3e..ffc53a918 100644
--- a/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
+++ b/print/src/test/java/com/baiyue/print/controller/InternalPdfControllerTest.java
@@ -11,6 +11,7 @@ import com.baiyue.print.service.DispatchBolPdfService;
 import com.baiyue.print.service.DropshipPalletA4PdfService;
 import com.baiyue.print.service.InboundMarkPdfService;
 import com.baiyue.print.service.FbaPalletPdfService;
+import com.baiyue.print.service.GenericPalletPdfService;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -52,6 +53,8 @@ class InternalPdfControllerTest {
     private DropshipPalletA4PdfService dropshipPalletA4PdfService;
     @MockBean
     private FbaPalletPdfService fbaPalletPdfService;
+    @MockBean
+    private GenericPalletPdfService genericPalletPdfService;
     @Resource
     private InternalPdfController controller;
     private MockMvc mockMvc;
@@ -232,12 +235,14 @@ class InternalPdfControllerTest {
                 .contains("/internal/print/v1/pdfs/inbound-marks:")
                 .contains("/internal/print/v1/pdfs/freight-a4-documents:")
                 .contains("/internal/print/v1/pdfs/dropship-pallet-a4-documents:")
+                .contains("/internal/print/v1/pdfs/pallet-a4-labels:")
                 .contains("application/pdf:")
                 .contains("application/json:")
                 .contains("name: X-Internal-Service-Token")
                 .contains("SEA_FREIGHT_SHIPPING_INSTRUCTION_A4_V1:")
                 .contains("BILL_OF_LADING_CONFIRMATION_A4_V1:")
                 .contains("DROPSHIP_PALLET_A4_V2")
+                .contains("PALLET_A4_LANDSCAPE_V1")
                 .contains("additionalProperties: false")
                 .contains("minItems: 1")
                 .contains("required: [marksAndNos, quantity, packaging, descriptionOfGoods, grossWeight, measurement]")
diff --git a/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java b/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
index 0ed8c97fc..4fdeee11a 100644
--- a/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
+++ b/print/src/test/java/com/baiyue/print/controller/PrintRequestSizeFilterTest.java
@@ -73,6 +73,16 @@ class PrintRequestSizeFilterTest {
         assertTooLarge(response);
     }
 
+    @Test
+    void capsGenericPalletRequestsBeforeDeserialization() throws Exception {
+        var response = new MockHttpServletResponse();
+        AtomicReference<Boolean> called = new AtomicReference<>(false);
+        filter.doFilter(request("12345678901", true, "/internal/print/v1/pdfs/pallet-a4-labels"),
+            response, (ignoredRequest, ignoredResponse) -> called.set(true));
+        assertThat(called).hasValue(false);
+        assertTooLarge(response);
+    }
+
     @Test
     void rejectsOversizedDeclaredContentLengthWithoutCallingDownstream() throws Exception {
         MockHttpServletRequest request = new MockHttpServletRequest() {
diff --git a/print/src/test/java/com/baiyue/print/service/GenericPalletPdfServiceGenerationTest.java b/print/src/test/java/com/baiyue/print/service/GenericPalletPdfServiceGenerationTest.java
new file mode 100644
index 000000000..44e851183
--- /dev/null
+++ b/print/src/test/java/com/baiyue/print/service/GenericPalletPdfServiceGenerationTest.java
@@ -0,0 +1,43 @@
+package com.baiyue.print.service;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.baiyue.print.config.PrintPdfProperties;
+import com.baiyue.print.dto.GenericPalletPdfDtos;
+import com.baiyue.print.renderer.GenericPalletRenderer;
+import com.baiyue.print.renderer.PdfBarcodeRenderer;
+import com.baiyue.print.renderer.PdfUnits;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+@SpringJUnitConfig(classes = {GenericPalletPdfService.class, PrintPdfProperties.class,
+    PdfGenerationLimiter.class, GenericPalletRenderer.class, PdfBarcodeRenderer.class})
+class GenericPalletPdfServiceGenerationTest {
+    @jakarta.annotation.Resource private GenericPalletPdfService service;
+
+    @Test
+    void generatesLandscapeA4WithoutUsingTheCartonMarkTemplate() throws Exception {
+        var generated = service.generate(new GenericPalletPdfDtos.Request(
+            GenericPalletPdfDtos.TEMPLATE,
+            new GenericPalletPdfDtos.PageSpec(new BigDecimal("297"), new BigDecimal("210")),
+            "pallet.pdf", List.of(new GenericPalletPdfDtos.Label(
+                "Los Angeles Warehouse", "Transfer WTR-1", "PALLET-001"))));
+        Files.createDirectories(Path.of("target"));
+        Files.write(Path.of("target", "generic-pallet-a4-preview.pdf"), generated.content());
+
+        try (PDDocument pdf = Loader.loadPDF(generated.content())) {
+            assertThat(pdf.getNumberOfPages()).isEqualTo(1);
+            assertThat(pdf.getPage(0).getMediaBox().getWidth()).isCloseTo(PdfUnits.mmToPt(297), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(pdf.getPage(0).getMediaBox().getHeight()).isCloseTo(PdfUnits.mmToPt(210), org.assertj.core.data.Offset.offset(.002f));
+            assertThat(new PDFTextStripper().getText(pdf)).contains(
+                "Los Angeles Warehouse", "Transfer WTR-1", "PALLET-001");
+        }
+    }
+}
diff --git a/warehouse-overseas-service/AGENTS.md b/warehouse-overseas-service/AGENTS.md
index 7bfb080eb..55adcf0ae 100644
--- a/warehouse-overseas-service/AGENTS.md
+++ b/warehouse-overseas-service/AGENTS.md
@@ -17,7 +17,7 @@
 | 托盘解析与业务绑定 | `controller/InternalWarehousePalletController.java`、`dto/WarehousePalletResolveResponse.java`、`entity/WarehousePalletBindingEntity.java` |
 | 柜级入库计划批量托盘 | `controller/InternalWarehousePalletBatchController.java`、`service/WarehousePalletBatchService.java`、`warehouse-pallet-batch-internal-v1.yaml`；以稳定批次键幂等执行 `ensure-reserved → confirm`，权威托盘码已存在且资源可预留时必须复用，未提供或不存在时才创建；Lastleg 本地计划事务失败时仅补偿仍为 `RESERVED` 的未确认资源，已 `CONFIRMED` 批次不得回退，同柜重放不得产生第二批资源 |
 | 仓储资源服务 | `service/WarehouseResourceService.java`、`WarehouseResourceLockService.java` |
-| 单张托盘标签 PDF | `controller/PlatformWarehouseResourceController.java` 的 `/pallets/{id}/label`、`service/PalletLabelPrintService.java`、`client/PrintPdfClient.java`；契约 `src/main/resources/openapi/pallet-label-v1.yaml`。有 FBA 仓码的托盘与国内统一调用 Print `/internal/print/v1/pdfs/fba-pallet-labels`、`FBA_PALLET_A4_LANDSCAPE_V1`：297×210 mm，顶部 SCK8 等仓码，完整托盘号作为 Code 128 与底部文字，141 等内部编号原样保留；其他托盘使用 `INBOUND_MARK_V1`。模板只在 Print 维护；沿用托盘列表权限与海外 Gateway 的 `warehouse-admin/**` 路由。`baiyue.clients.print.url` 对应 `PRINT_SERVICE_URL`，海外 Compose 必须与 BOL 一样显式注入国内 Print 地址，不能依赖海外 Nacos 发现国内服务；Feign 及熔断包装异常统一返回 `S0503` |
+| 单张托盘标签 PDF | `controller/PlatformWarehouseResourceController.java` 的 `/pallets/{id}/label`、`service/PalletLabelPrintService.java`、`client/PrintPdfClient.java`；契约 `src/main/resources/openapi/pallet-label-v1.yaml`。有 FBA 仓码的托盘与国内统一调用 Print `/internal/print/v1/pdfs/fba-pallet-labels`、`FBA_PALLET_A4_LANDSCAPE_V1`；其他托盘调用 `/internal/print/v1/pdfs/pallet-a4-labels`、`PALLET_A4_LANDSCAPE_V1`。两者均为 297×210 mm A4 横向，托盘完整编码作为 Code 128 与底部文字，托盘标不得回退到 100×100 mm 箱唛模板。模板只在 Print 维护；沿用托盘列表权限与海外 Gateway 的 `warehouse-admin/**` 路由。`baiyue.clients.print.url` 对应 `PRINT_SERVICE_URL`，海外 Compose 必须与 BOL 一样显式注入国内 Print 地址，不能依赖海外 Nacos 发现国内服务；Feign 及熔断包装异常统一返回 `S0503` |
 | 内部服务令牌 | `security/InternalServiceTokenGuard.java` |
 | 数据库基线与中文注释契约 | `src/main/resources/db/warehouse.sql`、`src/test/java/com/baiyue/warehouse/schema/SchemaChineseCommentContractTest.java` |
 | 测试 | `src/test/java/com/baiyue/warehouse/` |
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/client/PrintPdfClient.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/client/PrintPdfClient.java
index 1d88dde35..23d755d3b 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/client/PrintPdfClient.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/client/PrintPdfClient.java
@@ -21,13 +21,14 @@ public interface PrintPdfClient {
     record FbaPalletRequest(String templateCode, PageSpec pageSpec, String downloadFileName, List<FbaPalletLabel> labels) {}
     record FbaPalletLabel(String fbaWarehouseCode, String palletCode) {}
 
-    @PostMapping(value = "/inbound-marks", consumes = "application/json")
-    ResponseEntity<byte[]> generateInboundMarks(
+    @PostMapping(value = "/pallet-a4-labels", consumes = "application/json")
+    ResponseEntity<byte[]> generatePalletA4Labels(
         @RequestHeader("X-Internal-Service-Token") String token,
         @RequestHeader(value = "X-Request-Id", required = false) String requestId,
-        @RequestBody Request request);
+        @RequestBody PalletA4Request request);
+
+    record PalletA4Request(String templateCode, PageSpec pageSpec, String downloadFileName, List<PalletA4Label> labels) {}
+    record PalletA4Label(String heading, String reference, String palletCode) {}
 
-    record Request(String templateCode, PageSpec pageSpec, String downloadFileName, List<Label> labels) {}
     record PageSpec(BigDecimal widthMm, BigDecimal heightMm) {}
-    record Label(String topCode, String warehouseText, String cartonText, String routeText, String qrContent) {}
 }
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/PalletLabelPrintService.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/PalletLabelPrintService.java
index 08bf14e64..f30626233 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/PalletLabelPrintService.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/PalletLabelPrintService.java
@@ -39,7 +39,7 @@ public class PalletLabelPrintService {
         String code = pallet.getPalletCode();
         String fbaCode = pallet.getFbaWarehouseCode();
         boolean fba = fbaCode != null && !fbaCode.isBlank();
-        int maxCodeLength = fba ? 80 : 34;
+        int maxCodeLength = 80;
         // Preserve the authoritative pallet identity on both the barcode and visible text.
         if (code == null || !code.matches("[\\x20-\\x7E]{1," + maxCodeLength + "}") || code.isBlank()
                 || !code.equals(code.strip())) {
@@ -47,17 +47,14 @@ public class PalletLabelPrintService {
         }
         var warehouse = warehouses.required(warehouseId);
         String fileName = code.replaceAll("[\\\\/:*?\"<>|]", "-") + "-托盘码.pdf";
-        var label = new PrintPdfClient.Label(code,
-            fbaCode == null || fbaCode.isBlank() ? "目的仓待定" : fbaCode,
-            reference, warehouse.warehouseName(), code);
-        var request = new PrintPdfClient.Request("INBOUND_MARK_V1",
-            new PrintPdfClient.PageSpec(new BigDecimal("100"), new BigDecimal("100")), fileName, List.of(label));
         try {
             var response = fba
                 ? print.generateFbaPalletLabels(internalToken, requestId, new PrintPdfClient.FbaPalletRequest(
                     "FBA_PALLET_A4_LANDSCAPE_V1", new PrintPdfClient.PageSpec(new BigDecimal("297"), new BigDecimal("210")),
                     fileName, List.of(new PrintPdfClient.FbaPalletLabel(fbaCode, code))))
-                : print.generateInboundMarks(internalToken, requestId, request);
+                : print.generatePalletA4Labels(internalToken, requestId, new PrintPdfClient.PalletA4Request(
+                    "PALLET_A4_LANDSCAPE_V1", new PrintPdfClient.PageSpec(new BigDecimal("297"), new BigDecimal("210")),
+                    fileName, List.of(new PrintPdfClient.PalletA4Label(warehouse.warehouseName(), reference, code))));
             byte[] body = response == null ? null : response.getBody();
             MediaType type = response == null ? null : response.getHeaders().getContentType();
             if (response == null || !response.getStatusCode().is2xxSuccessful() || body == null || body.length == 0
diff --git a/warehouse-overseas-service/src/main/resources/openapi/pallet-label-v1.yaml b/warehouse-overseas-service/src/main/resources/openapi/pallet-label-v1.yaml
index 76648b372..8152ade7a 100644
--- a/warehouse-overseas-service/src/main/resources/openapi/pallet-label-v1.yaml
+++ b/warehouse-overseas-service/src/main/resources/openapi/pallet-label-v1.yaml
@@ -7,7 +7,7 @@ paths:
     get:
       operationId: printOverseasPalletLabel
       summary: 下载指定托盘的一页标签 PDF
-      description: 平台公共资源，要求 platform:overseas-warehouse:pallet:list。校验仓库和托盘归属后，有 FBA 仓码的托盘统一调用 Print FBA_PALLET_A4_LANDSCAPE_V1（297×210mm），顶部显示 SCK8 等 FBA 仓码，托盘完整编码同时作为 Code 128 内容和底部文字；内部编号如 141 原样保留。FBA 编码限 1–80 位可打印 ASCII，禁止首尾空格。不创建或修改托盘。其他托盘继续使用其现有 INBOUND_MARK_V1（100×100mm，编码限 1–34 位）。
+      description: 平台公共资源，要求 platform:overseas-warehouse:pallet:list。校验仓库和托盘归属后，有 FBA 仓码的托盘统一调用 Print FBA_PALLET_A4_LANDSCAPE_V1（297×210mm），顶部显示 SCK8 等 FBA 仓码；其他托盘调用 PALLET_A4_LANDSCAPE_V1（297×210mm），展示仓库名称和业务参考。托盘完整编码同时作为 Code 128 内容和底部文字，限 1–80 位可打印 ASCII 且禁止首尾空格。不创建或修改托盘，不复用 100×100mm 箱唛模板。
       security:
         - bearerAuth: []
       parameters:
diff --git a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/PalletLabelPrintServiceTest.java b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/PalletLabelPrintServiceTest.java
index ee805f0ec..7731b69b6 100644
--- a/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/PalletLabelPrintServiceTest.java
+++ b/warehouse-overseas-service/src/test/java/com/baiyue/warehouse/service/PalletLabelPrintServiceTest.java
@@ -56,7 +56,6 @@ class PalletLabelPrintServiceTest {
         assertThat(response.getBody()).isEqualTo(pdf);
         verify(resources).pallet(0L, 200L, 9L);
         verifyNoMoreInteractions(resources);
-        verify(print, never()).generateInboundMarks(any(), any(), any());
     }
 
     @Test
@@ -64,18 +63,20 @@ class PalletLabelPrintServiceTest {
         pallet.setPalletCode("ABCD1234567-ABE3-003");
         pallet.setFbaWarehouseCode(null);
         byte[] pdf = "%PDF-transfer-label".getBytes(java.nio.charset.StandardCharsets.US_ASCII);
-        when(print.generateInboundMarks(anyString(), anyString(), any()))
+        when(print.generatePalletA4Labels(anyString(), anyString(), any()))
             .thenReturn(ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF).body(pdf));
 
         service.printTransfer(200L, 9L, "WTR-20260916-1", "request-transfer");
 
-        var request = ArgumentCaptor.forClass(PrintPdfClient.Request.class);
-        verify(print).generateInboundMarks(eq("test-token"), eq("request-transfer"), request.capture());
+        var request = ArgumentCaptor.forClass(PrintPdfClient.PalletA4Request.class);
+        verify(print).generatePalletA4Labels(eq("test-token"), eq("request-transfer"), request.capture());
+        assertThat(request.getValue().templateCode()).isEqualTo("PALLET_A4_LANDSCAPE_V1");
+        assertThat(request.getValue().pageSpec().widthMm()).isEqualByComparingTo("297");
+        assertThat(request.getValue().pageSpec().heightMm()).isEqualByComparingTo("210");
         assertThat(request.getValue().labels()).singleElement().satisfies(label -> {
-            assertThat(label.topCode()).isEqualTo("ABCD1234567-ABE3-003");
-            assertThat(label.cartonText()).isEqualTo("转运单 WTR-20260916-1");
-            assertThat(label.warehouseText()).isEqualTo("目的仓待定");
-            assertThat(label.routeText()).isEqualTo("洛杉矶仓");
+            assertThat(label.heading()).isEqualTo("洛杉矶仓");
+            assertThat(label.reference()).isEqualTo("转运单 WTR-20260916-1");
+            assertThat(label.palletCode()).isEqualTo("ABCD1234567-ABE3-003");
         });
     }
 
@@ -120,12 +121,12 @@ class PalletLabelPrintServiceTest {
     @Test
     void keepsNonFbaLabelsOnTheirOwnTemplate() {
         pallet.setFbaWarehouseCode(null);
-        when(print.generateInboundMarks(anyString(), anyString(), any()))
+        when(print.generatePalletA4Labels(anyString(), anyString(), any()))
             .thenReturn(ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF).body("%PDF-other".getBytes()));
         service.print(200L, 9L, "request-1");
-        var captor = ArgumentCaptor.forClass(PrintPdfClient.Request.class);
-        verify(print).generateInboundMarks(anyString(), anyString(), captor.capture());
-        assertThat(captor.getValue().templateCode()).isEqualTo("INBOUND_MARK_V1");
+        var captor = ArgumentCaptor.forClass(PrintPdfClient.PalletA4Request.class);
+        verify(print).generatePalletA4Labels(anyString(), anyString(), captor.capture());
+        assertThat(captor.getValue().templateCode()).isEqualTo("PALLET_A4_LANDSCAPE_V1");
         verify(print, never()).generateFbaPalletLabels(any(), any(), any());
     }
 }

From b9e0c8ea2f56c3636f910be85167d26b3d344134 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:22:06 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaiyueSecurityAutoConfiguration.java      |   2 +-
 deploy/sql/头程数据库统一增量-MySQL8.sql      |  40 +++
 .../file/controller/PdaReleaseController.java |  88 ++++++
 .../file/service/PdaPackageStorage.java       |  83 ++++++
 .../file/service/PdaReleaseService.java       | 229 +++++++++++++++
 file/src/main/resources/application.yml       |   8 +-
 file/src/main/resources/db/file.sql           |  34 +++
 .../InternalPriceBookController.java          |  11 +
 .../main/resources/openapi/firstleg-v1.yaml   |  11 +
 gateway/src/main/resources/application.yml    |   3 +-
 .../main/resources/db/phase1-admin-rbac.sql   |  14 +-
 order/AGENTS.md                               |   1 +
 .../client/LegacyImportPricingClient.java     |  20 ++
 .../client/LegacyImportWarehouseClient.java   |  18 ++
 .../order/client/TenantEligibilityClient.java |   8 +
 .../PlatformFirstLegOrderController.java      |  19 ++
 .../dto/PlatformLegacyOrderImportDtos.java    |  19 ++
 .../service/OrderApplicationService.java      |  30 +-
 .../PlatformLegacyOrderImportService.java     | 274 ++++++++++++++++++
 .../src/main/resources/openapi/order-v1.yaml  |  19 ++
 ...eOrderExportPermissionSqlContractTest.java |   2 +-
 .../OrderControllerPermissionTest.java        |   3 +
 .../OrderDeclarationUpdateContractTest.java   |   2 +-
 .../PlatformOrderPageControllerTest.java      |   2 +
 .../PlatformLegacyOrderImportServiceTest.java | 109 +++++++
 .../InternalWarehouseController.java          |   7 +
 .../repository/WarehouseRepository.java       |  10 +
 .../service/WarehouseApplicationService.java  |  10 +
 .../main/resources/openapi/warehouse-v1.yaml  |  19 ++
 29 files changed, 1078 insertions(+), 17 deletions(-)
 create mode 100644 file/src/main/java/com/baiyue/file/controller/PdaReleaseController.java
 create mode 100644 file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
 create mode 100644 file/src/main/java/com/baiyue/file/service/PdaReleaseService.java
 create mode 100644 order/src/main/java/com/baiyue/order/client/LegacyImportPricingClient.java
 create mode 100644 order/src/main/java/com/baiyue/order/client/LegacyImportWarehouseClient.java
 create mode 100644 order/src/main/java/com/baiyue/order/dto/PlatformLegacyOrderImportDtos.java
 create mode 100644 order/src/main/java/com/baiyue/order/service/PlatformLegacyOrderImportService.java
 create mode 100644 order/src/test/java/com/baiyue/order/service/PlatformLegacyOrderImportServiceTest.java
 create mode 100644 warehouse/src/main/resources/openapi/warehouse-v1.yaml

diff --git a/common-security/src/main/java/com/baiyue/common/security/BaiyueSecurityAutoConfiguration.java b/common-security/src/main/java/com/baiyue/common/security/BaiyueSecurityAutoConfiguration.java
index 3713986d1..f27f21ff9 100644
--- a/common-security/src/main/java/com/baiyue/common/security/BaiyueSecurityAutoConfiguration.java
+++ b/common-security/src/main/java/com/baiyue/common/security/BaiyueSecurityAutoConfiguration.java
@@ -84,7 +84,7 @@ public class BaiyueSecurityAutoConfiguration {
                 .exceptionHandling(errors -> errors
                         .authenticationEntryPoint(entryPoint).accessDeniedHandler(deniedHandler))
                 .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/actuator/health", "/v3/api-docs/**", "/swagger-ui/**").permitAll()
+                        .requestMatchers("/actuator/health", "/v3/api-docs/**", "/swagger-ui/**", "/api/pda-updates/**").permitAll()
                         .requestMatchers("/internal/**").permitAll()
                         .requestMatchers("/openapi/**").permitAll()
                         .requestMatchers("/api/merchant/**").hasAuthority("APP_MERCHANT")
diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql
index 9bc6efa61..9d1ddbd2f 100644
--- a/deploy/sql/头程数据库统一增量-MySQL8.sql
+++ b/deploy/sql/头程数据库统一增量-MySQL8.sql
@@ -4449,6 +4449,39 @@ CREATE TABLE file_object (
   KEY idx_file_tenant_created (tenant_id,created_at)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='文件元数据表';
 
+CREATE TABLE file_pda_release_channel (
+  app_code varchar(16) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  current_apk_id char(36) DEFAULT NULL,
+  current_wgt_id char(36) DEFAULT NULL,
+  PRIMARY KEY (app_code)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='国内/海外PDA当前发布指针';
+
+INSERT INTO file_pda_release_channel (app_code,app_id) VALUES
+('domestic','__UNI__9BFFAF2'),('overseas','__UNI__936D079');
+
+CREATE TABLE file_pda_release (
+  id char(36) NOT NULL,
+  app_code varchar(16) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  package_type varchar(8) NOT NULL,
+  version_name varchar(32) NOT NULL,
+  version_code int unsigned NOT NULL,
+  min_app_version_code int unsigned NOT NULL,
+  mandatory tinyint(1) NOT NULL DEFAULT '0',
+  release_notes varchar(1000) NOT NULL DEFAULT '',
+  status varchar(16) NOT NULL DEFAULT 'DRAFT',
+  object_key varchar(128) NOT NULL,
+  sha256 char(64) NOT NULL,
+  size_bytes bigint unsigned NOT NULL,
+  created_by bigint unsigned NOT NULL,
+  created_at datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  published_at datetime(3) DEFAULT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_pda_release_version (app_code,package_type,version_name),
+  KEY idx_pda_release_created (app_code,created_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='PDA安装包与热更新发布历史';
+
 -- 服务 schema：baiyue_audit
 CREATE DATABASE IF NOT EXISTS baiyue_audit DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
 USE baiyue_audit;
@@ -6004,6 +6037,8 @@ INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id,
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5101034,0,'PLATFORM','BUTTON',5101030,'platform:permission:delete','删除权限资源',NULL,NULL,40,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5101040,0,'PLATFORM','MENU',5101000,'platform:member:list','平台成员',NULL,NULL,40,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5101041,0,'PLATFORM','BUTTON',5101040,'platform:member:grant-role','分配成员角色',NULL,NULL,10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
+INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5101060,0,'PLATFORM','MENU',5101000,'platform:pda-release:list','PDA版本','/system/pda-releases',NULL,60,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
+INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5101061,0,'PLATFORM','BUTTON',5101060,'platform:pda-release:manage','发布PDA版本',NULL,NULL,10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102000,0,'PLATFORM','MENU',0,'platform:order','头程订单','/first-leg-orders',NULL,30,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102010,0,'PLATFORM','MENU',5102000,'platform:order:list','订单列表','/first-leg-orders/list',NULL,10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102011,0,'PLATFORM','BUTTON',5102010,'platform:order:approve','订单审核通过',NULL,NULL,10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
@@ -6023,6 +6058,7 @@ INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id,
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102025,0,'PLATFORM','BUTTON',5102010,'platform:order:submit','平台代客提交订单',NULL,NULL,110,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102026,0,'PLATFORM','BUTTON',5102010,'platform:order:export','导出订单列表',NULL,NULL,120,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102027,0,'PLATFORM','BUTTON',5102010,'platform:order:declaration:edit','修改订单申报与运营预估',NULL,NULL,130,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
+INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102028,0,'PLATFORM','BUTTON',5102010,'platform:order:import','导入旧系统订单',NULL,NULL,140,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102030,0,'PLATFORM','MENU',5102000,'platform:firstleg:inbound:list','入库单','/inbounds','GET',30,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102031,0,'PLATFORM','BUTTON',5102030,'platform:firstleg:inbound:view','查看入库单详情',NULL,'GET',10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5102032,0,'PLATFORM','BUTTON',5102030,'platform:firstleg:inbound:hold','扣货与解除扣货',NULL,'POST',20,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
@@ -6380,6 +6416,8 @@ INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at)
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5101034,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5101040,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5101041,0,CURRENT_TIMESTAMP(3));
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5101060,0,CURRENT_TIMESTAMP(3));
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5101061,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102000,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102010,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102011,0,CURRENT_TIMESTAMP(3));
@@ -6399,6 +6437,7 @@ INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at)
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102025,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102026,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102027,0,CURRENT_TIMESTAMP(3));
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102028,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102030,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102031,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000001,5102032,0,CURRENT_TIMESTAMP(3));
@@ -6676,6 +6715,7 @@ INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at)
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102025,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102026,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102027,0,CURRENT_TIMESTAMP(3));
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102028,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102030,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102031,0,CURRENT_TIMESTAMP(3));
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id, created_at) VALUES (4000003,5102041,0,CURRENT_TIMESTAMP(3));
diff --git a/file/src/main/java/com/baiyue/file/controller/PdaReleaseController.java b/file/src/main/java/com/baiyue/file/controller/PdaReleaseController.java
new file mode 100644
index 000000000..33dab387c
--- /dev/null
+++ b/file/src/main/java/com/baiyue/file/controller/PdaReleaseController.java
@@ -0,0 +1,88 @@
+package com.baiyue.file.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.file.service.PdaReleaseService;
+import org.springframework.core.io.Resource;
+import org.springframework.http.CacheControl;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class PdaReleaseController {
+    private final PdaReleaseService releases;
+
+    public PdaReleaseController(PdaReleaseService releases) { this.releases = releases; }
+
+    @GetMapping("/api/platform/v1/files/pda-releases/{app}")
+    @PreAuthorize("hasAuthority('platform:pda-release:list')")
+    public ApiResponse<List<PdaReleaseService.Release>> list(@AuthenticationPrincipal AuthenticatedUser user,
+                                                               @PathVariable String app) {
+        requirePlatform(user);
+        return ApiResponse.success(releases.list(app));
+    }
+
+    @PostMapping(value = "/api/platform/v1/files/pda-releases/{app}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PreAuthorize("hasAuthority('platform:pda-release:manage')")
+    public ApiResponse<PdaReleaseService.Release> upload(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String app, @RequestParam String packageType, @RequestParam String versionName,
+        @RequestParam int versionCode, @RequestParam int minAppVersionCode,
+        @RequestParam(defaultValue = "false") boolean mandatory, @RequestParam(defaultValue = "") String releaseNotes,
+        @RequestPart("file") MultipartFile file) {
+        return ApiResponse.success(releases.upload(app, packageType, versionName, versionCode,
+            minAppVersionCode, mandatory, releaseNotes, file, requirePlatform(user)));
+    }
+
+    @PostMapping("/api/platform/v1/files/pda-releases/{id}/publish")
+    @PreAuthorize("hasAuthority('platform:pda-release:manage')")
+    public ApiResponse<PdaReleaseService.Release> publish(@AuthenticationPrincipal AuthenticatedUser user,
+                                                           @PathVariable String id) {
+        requirePlatform(user);
+        return ApiResponse.success(releases.publish(id));
+    }
+
+    @PostMapping("/api/platform/v1/files/pda-releases/{id}/withdraw")
+    @PreAuthorize("hasAuthority('platform:pda-release:manage')")
+    public ApiResponse<PdaReleaseService.Release> withdraw(@AuthenticationPrincipal AuthenticatedUser user,
+                                                            @PathVariable String id) {
+        requirePlatform(user);
+        return ApiResponse.success(releases.withdraw(id));
+    }
+
+    @GetMapping("/api/pda-updates/{app}/latest")
+    public Map<String, Object> latest(@PathVariable String app, @RequestParam String appid,
+        @RequestParam String platform, @RequestParam int appVersionCode, @RequestParam String wgtVersion) {
+        return releases.latest(app, appid, platform, appVersionCode, wgtVersion);
+    }
+
+    @GetMapping("/api/pda-updates/{app}/{id}/package")
+    public ResponseEntity<Resource> download(@PathVariable String app, @PathVariable String id) {
+        PdaReleaseService.PackageFile file = releases.packageFile(app, id);
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore())
+            .contentType(MediaType.APPLICATION_OCTET_STREAM).contentLength(file.sizeBytes())
+            .header(HttpHeaders.CONTENT_DISPOSITION, ContentDisposition.attachment()
+                .filename(file.fileName(), StandardCharsets.UTF_8).build().toString())
+            .body(file.resource());
+    }
+
+    private static long requirePlatform(AuthenticatedUser user) {
+        if (user == null || !"PLATFORM".equalsIgnoreCase(user.appCode())
+            || user.tenantId() == null || user.tenantId() != 0L
+            || user.userId() == null || user.userId() <= 0) {
+            throw new BizException(ResultCode.FORBIDDEN, "需要平台端身份");
+        }
+        return user.userId();
+    }
+}
diff --git a/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java b/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
new file mode 100644
index 000000000..688664cc9
--- /dev/null
+++ b/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
@@ -0,0 +1,83 @@
+package com.baiyue.file.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.PathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HexFormat;
+import java.util.zip.ZipFile;
+
+@Component
+public class PdaPackageStorage {
+    private static final long MAX_BYTES = 200L * 1024 * 1024;
+    private final Path root;
+
+    public PdaPackageStorage(@Value("${baiyue.file.storage-root}") String storageRoot) {
+        root = Path.of(storageRoot).toAbsolutePath().normalize().resolve("pda-packages");
+    }
+
+    public record Stored(String key, long sizeBytes, String sha256) { }
+
+    public Stored store(String app, String id, String type, MultipartFile file) {
+        if (file == null || file.isEmpty() || file.getSize() > MAX_BYTES) {
+            throw new BizException(ResultCode.BAD_REQUEST, "更新包为空或超过 200MB");
+        }
+        String name = file.getOriginalFilename();
+        if (name == null || !name.toLowerCase().endsWith("." + type)) {
+            throw new BizException(ResultCode.BAD_REQUEST, "文件扩展名与包类型不符");
+        }
+        String key = app + "/" + id + "." + type;
+        Path target = path(key);
+        try {
+            Files.createDirectories(target.getParent());
+            file.transferTo(target);
+            try (ZipFile zip = new ZipFile(target.toFile())) {
+                if (zip.size() == 0) throw new IOException("empty archive");
+            }
+            return new Stored(key, Files.size(target), sha256(target));
+        } catch (IOException | IllegalStateException exception) {
+            delete(key);
+            throw new BizException(ResultCode.BAD_REQUEST, "更新包不是有效的 APK/WGT 文件");
+        }
+    }
+
+    public Resource load(String key) {
+        Path file = path(key);
+        if (!Files.isRegularFile(file)) throw new BizException(ResultCode.NOT_FOUND, "更新包文件不存在");
+        return new PathResource(file);
+    }
+
+    public void delete(String key) {
+        try { Files.deleteIfExists(path(key)); } catch (IOException ignored) { }
+    }
+
+    private Path path(String key) {
+        if (key == null || !key.matches("(domestic|overseas)/[a-f0-9-]{36}\\.(apk|wgt)")) {
+            throw new BizException(ResultCode.BAD_REQUEST, "更新包路径无效");
+        }
+        Path path = root.resolve(key).normalize();
+        if (!path.startsWith(root)) throw new BizException(ResultCode.FORBIDDEN, "更新包路径越界");
+        return path;
+    }
+
+    private static String sha256(Path file) throws IOException {
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            try (InputStream input = Files.newInputStream(file)) {
+                byte[] buffer = new byte[8192];
+                for (int count; (count = input.read(buffer)) >= 0;) digest.update(buffer, 0, count);
+            }
+            return HexFormat.of().formatHex(digest.digest());
+        } catch (NoSuchAlgorithmException exception) { throw new IllegalStateException(exception); }
+    }
+}
diff --git a/file/src/main/java/com/baiyue/file/service/PdaReleaseService.java b/file/src/main/java/com/baiyue/file/service/PdaReleaseService.java
new file mode 100644
index 000000000..f5468b559
--- /dev/null
+++ b/file/src/main/java/com/baiyue/file/service/PdaReleaseService.java
@@ -0,0 +1,229 @@
+package com.baiyue.file.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+
+@Service
+public class PdaReleaseService {
+    private final JdbcTemplate jdbc;
+    private final PdaPackageStorage storage;
+    private final String publicBaseUrl;
+    private final String domesticAppId;
+    private final String overseasAppId;
+
+    public PdaReleaseService(JdbcTemplate jdbc, PdaPackageStorage storage,
+        @Value("${baiyue.file.pda.public-base-url:}") String publicBaseUrl,
+        @Value("${baiyue.file.pda.domestic-appid:__UNI__9BFFAF2}") String domesticAppId,
+        @Value("${baiyue.file.pda.overseas-appid:__UNI__936D079}") String overseasAppId) {
+        this.jdbc = jdbc;
+        this.storage = storage;
+        this.publicBaseUrl = publicBaseUrl.replaceAll("/+$", "");
+        this.domesticAppId = domesticAppId;
+        this.overseasAppId = overseasAppId;
+        if (!this.publicBaseUrl.isEmpty() && !this.publicBaseUrl.startsWith("https://")) {
+            throw new IllegalArgumentException("PDA_UPDATE_PUBLIC_BASE_URL must use HTTPS");
+        }
+    }
+
+    public record Release(String id, String app, String appid, String packageType, String versionName,
+                          int versionCode, int minAppVersionCode, boolean mandatory, String releaseNotes,
+                          String status, boolean current, String sha256, long sizeBytes, String downloadUrl,
+                          LocalDateTime createdAt, LocalDateTime publishedAt) { }
+    public record PackageFile(Resource resource, long sizeBytes, String fileName) { }
+
+    private record Row(String id, String app, String appid, String type, String name, int code,
+                       int minCode, boolean mandatory, String notes, String status,
+                       String key, String sha256, long bytes, LocalDateTime createdAt,
+                       LocalDateTime publishedAt) { }
+    private record Channel(String appid, String apkId, String wgtId) { }
+
+    public Release upload(String app, String type, String versionName, int versionCode,
+                          int minAppVersionCode, boolean mandatory, String notes,
+                          MultipartFile file, long operatorId) {
+        String appid = appid(app);
+        type = type == null ? "" : type.toLowerCase();
+        if (!type.equals("apk") && !type.equals("wgt")) throw bad("只支持 APK 或 WGT");
+        if (versionName == null || versionName.length() > 32
+            || !versionName.matches("\\d+(\\.\\d+)+")) throw bad("版本号格式无效");
+        if (versionCode < 1 || minAppVersionCode < 1
+            || (type.equals("apk") && versionCode != minAppVersionCode)) {
+            throw bad("APK 版本号或 WGT 最低基座版本无效");
+        }
+        if (notes != null && notes.length() > 1000) throw bad("更新说明过长");
+        String id = UUID.randomUUID().toString();
+        PdaPackageStorage.Stored stored = storage.store(app, id, type, file);
+        try {
+            jdbc.update("""
+                INSERT INTO file_pda_release
+                (id,app_code,app_id,package_type,version_name,version_code,min_app_version_code,
+                 mandatory,release_notes,status,object_key,sha256,size_bytes,created_by)
+                VALUES (?,?,?,?,?,?,?,?,?,'DRAFT',?,?,?,?)
+                """, id, app, appid, type, versionName, versionCode, minAppVersionCode,
+                mandatory, notes == null ? "" : notes, stored.key(), stored.sha256(),
+                stored.sizeBytes(), operatorId);
+        } catch (RuntimeException exception) {
+            storage.delete(stored.key());
+            throw exception;
+        }
+        return view(get(id));
+    }
+
+    @Transactional
+    public Release publish(String id) {
+        Row row = get(id);
+        if (!row.status().equals("DRAFT")) throw conflict("只有草稿可以发布");
+        if (publicBaseUrl.isEmpty()) {
+            throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "更新服务公开地址未配置");
+        }
+        Channel channel = channel(row.app(), true);
+        if (!Objects.equals(channel.appid(), row.appid())) throw conflict("应用 AppID 已改变，请重新上传");
+        Row current = current(row.type().equals("apk") ? channel.apkId() : channel.wgtId());
+        if (current != null && (row.type().equals("apk")
+            ? row.code() <= current.code()
+            : compareVersion(row.name(), current.name()) <= 0)) {
+            throw conflict("新版本必须高于当前发布版本");
+        }
+        if (row.type().equals("wgt")) {
+            Row apk = current(channel.apkId());
+            if (apk == null || row.minCode() > apk.code()) throw conflict("请先发布兼容的 APK 基座");
+        }
+        storage.load(row.key());
+        if (jdbc.update("UPDATE file_pda_release SET status='PUBLISHED',published_at=CURRENT_TIMESTAMP(3) WHERE id=? AND status='DRAFT'", id) != 1) {
+            throw conflict("版本状态已改变");
+        }
+        String column = row.type().equals("apk") ? "current_apk_id" : "current_wgt_id";
+        jdbc.update("UPDATE file_pda_release_channel SET " + column + "=? WHERE app_code=?", id, row.app());
+        return view(get(id));
+    }
+
+    @Transactional
+    public Release withdraw(String id) {
+        Row row = get(id);
+        Channel channel = channel(row.app(), true);
+        if (!row.status().equals("PUBLISHED")) throw conflict("只有已发布版本可以停发");
+        String column = row.type().equals("apk") ? "current_apk_id" : "current_wgt_id";
+        String currentId = row.type().equals("apk") ? channel.apkId() : channel.wgtId();
+        if (id.equals(currentId)) {
+            jdbc.update("UPDATE file_pda_release_channel SET " + column + "=NULL WHERE app_code=?", row.app());
+        }
+        jdbc.update("UPDATE file_pda_release SET status='WITHDRAWN' WHERE id=?", id);
+        return view(get(id));
+    }
+
+    public List<Release> list(String app) {
+        appid(app);
+        Channel channel = channel(app, false);
+        List<Row> rows = jdbc.query("SELECT * FROM file_pda_release WHERE app_code=? ORDER BY created_at DESC LIMIT 100",
+            (rs, index) -> map(rs), app);
+        return rows.stream().map(row -> view(row, channel)).toList();
+    }
+
+    public Map<String, Object> latest(String app, String requestedAppid, String platform,
+                                      int appVersionCode, String wgtVersion) {
+        if (!appid(app).equals(requestedAppid) || !"android".equalsIgnoreCase(platform)
+            || appVersionCode < 1 || wgtVersion == null || !wgtVersion.matches("\\d+(\\.\\d+)+")) {
+            throw bad("更新检查参数无效");
+        }
+        Channel channel = channel(app, false);
+        Row apk = current(channel.apkId());
+        if (apk != null && apk.code() > appVersionCode) return manifest(apk);
+        Row wgt = current(channel.wgtId());
+        if (wgt != null && wgt.minCode() <= appVersionCode
+            && compareVersion(wgt.name(), wgtVersion) > 0) return manifest(wgt);
+        return Map.of("update", false);
+    }
+
+    public PackageFile packageFile(String app, String id) {
+        Row row = get(id);
+        if (!row.app().equals(app) || !row.status().equals("PUBLISHED")) {
+            throw new BizException(ResultCode.NOT_FOUND, "更新包不存在");
+        }
+        return new PackageFile(storage.load(row.key()), row.bytes(),
+            row.app() + "-pda-" + row.name() + "." + row.type());
+    }
+
+    private Map<String, Object> manifest(Row row) {
+        if (publicBaseUrl.isEmpty()) throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "更新服务公开地址未配置");
+        return Map.of("update", true, "appid", row.appid(), "packageType", row.type(),
+            "versionName", row.name(), "versionCode", row.code(), "minAppVersionCode", row.minCode(),
+            "mandatory", row.mandatory(), "releaseNotes", row.notes(), "downloadUrl", url(row));
+    }
+
+    private Release view(Row row) {
+        return view(row, channel(row.app(), false));
+    }
+
+    private Release view(Row row, Channel channel) {
+        boolean current = row.id().equals(row.type().equals("apk") ? channel.apkId() : channel.wgtId());
+        return new Release(row.id(), row.app(), row.appid(), row.type(), row.name(), row.code(),
+            row.minCode(), row.mandatory(), row.notes(), row.status(), current, row.sha256(), row.bytes(),
+            row.status().equals("PUBLISHED") && !publicBaseUrl.isEmpty() ? url(row) : null,
+            row.createdAt(), row.publishedAt());
+    }
+
+    private String url(Row row) {
+        return publicBaseUrl + "/api/pda-updates/" + row.app() + "/" + row.id() + "/package";
+    }
+
+    private Channel channel(String app, boolean locked) {
+        String sql = "SELECT app_id,current_apk_id,current_wgt_id FROM file_pda_release_channel WHERE app_code=?"
+            + (locked ? " FOR UPDATE" : "");
+        List<Channel> rows = jdbc.query(sql, (rs, index) ->
+            new Channel(rs.getString(1), rs.getString(2), rs.getString(3)), app);
+        if (rows.isEmpty()) throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "PDA 发布通道未初始化");
+        return rows.get(0);
+    }
+
+    private Row current(String id) { return id == null ? null : get(id); }
+
+    private Row get(String id) {
+        List<Row> rows = jdbc.query("SELECT * FROM file_pda_release WHERE id=?", (rs, index) -> map(rs), id);
+        if (rows.isEmpty()) throw new BizException(ResultCode.NOT_FOUND, "PDA 版本不存在");
+        return rows.get(0);
+    }
+
+    private String appid(String app) {
+        return switch (app) {
+            case "domestic" -> domesticAppId;
+            case "overseas" -> overseasAppId;
+            default -> throw bad("PDA 应用类型无效");
+        };
+    }
+
+    private static Row map(ResultSet rs) throws SQLException {
+        return new Row(rs.getString("id"), rs.getString("app_code"), rs.getString("app_id"),
+            rs.getString("package_type"), rs.getString("version_name"), rs.getInt("version_code"),
+            rs.getInt("min_app_version_code"), rs.getBoolean("mandatory"), rs.getString("release_notes"),
+            rs.getString("status"), rs.getString("object_key"), rs.getString("sha256"), rs.getLong("size_bytes"),
+            rs.getTimestamp("created_at").toLocalDateTime(),
+            rs.getTimestamp("published_at") == null ? null : rs.getTimestamp("published_at").toLocalDateTime());
+    }
+
+    private static int compareVersion(String left, String right) {
+        String[] a = left.split("\\.");
+        String[] b = right.split("\\.");
+        for (int i = 0; i < Math.max(a.length, b.length); i++) {
+            int x = i < a.length ? Integer.parseInt(a[i]) : 0;
+            int y = i < b.length ? Integer.parseInt(b[i]) : 0;
+            if (x != y) return Integer.compare(x, y);
+        }
+        return 0;
+    }
+
+    private static BizException bad(String message) { return new BizException(ResultCode.BAD_REQUEST, message); }
+    private static BizException conflict(String message) { return new BizException(ResultCode.CONFLICT, message); }
+}
diff --git a/file/src/main/resources/application.yml b/file/src/main/resources/application.yml
index ef4179c70..be91f53d6 100644
--- a/file/src/main/resources/application.yml
+++ b/file/src/main/resources/application.yml
@@ -40,8 +40,8 @@ spring:
             read-timeout: 15000
   servlet:
     multipart:
-      max-file-size: 50MB
-      max-request-size: 51MB
+      max-file-size: 200MB
+      max-request-size: 201MB
 rocketmq:
   name-server: ${ROCKETMQ_NAME_SERVER:127.0.0.1:9876}
   producer:
@@ -60,6 +60,10 @@ baiyue:
       url: ${FINANCE_SERVICE_URL:}
   file:
     storage-root: ${FILE_STORAGE_ROOT:${user.home}/baiyue-firstleg/uploads}
+    pda:
+      public-base-url: ${PDA_UPDATE_PUBLIC_BASE_URL:}
+      domestic-appid: ${PDA_DOMESTIC_APPID:__UNI__9BFFAF2}
+      overseas-appid: ${PDA_OVERSEAS_APPID:__UNI__936D079}
     price-book:
       max-size-bytes: ${FILE_PRICE_BOOK_MAX_SIZE_BYTES:10485760}
     export:
diff --git a/file/src/main/resources/db/file.sql b/file/src/main/resources/db/file.sql
index 17c8d2f4d..45f809085 100644
--- a/file/src/main/resources/db/file.sql
+++ b/file/src/main/resources/db/file.sql
@@ -28,6 +28,40 @@ CREATE TABLE IF NOT EXISTS file_object (
   KEY idx_file_tenant_created (tenant_id, created_at)
 ) ENGINE=InnoDB COMMENT='文件元数据表';
 
+CREATE TABLE IF NOT EXISTS file_pda_release_channel (
+  app_code VARCHAR(16) NOT NULL,
+  app_id VARCHAR(64) NOT NULL,
+  current_apk_id CHAR(36) NULL,
+  current_wgt_id CHAR(36) NULL,
+  PRIMARY KEY (app_code)
+) ENGINE=InnoDB COMMENT='国内/海外PDA当前发布指针';
+
+INSERT INTO file_pda_release_channel (app_code, app_id) VALUES
+  ('domestic', '__UNI__9BFFAF2'), ('overseas', '__UNI__936D079')
+ON DUPLICATE KEY UPDATE app_id=VALUES(app_id);
+
+CREATE TABLE IF NOT EXISTS file_pda_release (
+  id CHAR(36) NOT NULL,
+  app_code VARCHAR(16) NOT NULL,
+  app_id VARCHAR(64) NOT NULL,
+  package_type VARCHAR(8) NOT NULL,
+  version_name VARCHAR(32) NOT NULL,
+  version_code INT UNSIGNED NOT NULL,
+  min_app_version_code INT UNSIGNED NOT NULL,
+  mandatory TINYINT(1) NOT NULL DEFAULT 0,
+  release_notes VARCHAR(1000) NOT NULL DEFAULT '',
+  status VARCHAR(16) NOT NULL DEFAULT 'DRAFT',
+  object_key VARCHAR(128) NOT NULL,
+  sha256 CHAR(64) NOT NULL,
+  size_bytes BIGINT UNSIGNED NOT NULL,
+  created_by BIGINT UNSIGNED NOT NULL,
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  published_at DATETIME(3) NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_pda_release_version (app_code, package_type, version_name),
+  KEY idx_pda_release_created (app_code, created_at)
+) ENGINE=InnoDB COMMENT='PDA安装包与热更新发布历史';
+
 CREATE TABLE IF NOT EXISTS file_download_token (
   id BIGINT UNSIGNED NOT NULL COMMENT '下载令牌ID',
   tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户ID和数据隔离键',
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/controller/InternalPriceBookController.java b/firstleg/src/main/java/com/baiyue/firstleg/controller/InternalPriceBookController.java
index 43973be5d..a734756ee 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/controller/InternalPriceBookController.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/controller/InternalPriceBookController.java
@@ -12,6 +12,8 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -58,6 +60,15 @@ public class InternalPriceBookController {
             request.channelCode(), request.destinationType(), request.requireInboundCodePrefix()));
     }
 
+    @GetMapping("/channels")
+    public ApiResponse<java.util.List<com.baiyue.firstleg.dto.PriceBookDtos.CurrentChannel>> channels(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @RequestParam long tenantId,
+        @RequestParam long originWarehouseId) {
+        requireToken(token);
+        return ApiResponse.success(service.channels(tenantId, originWarehouseId));
+    }
+
     private void requireToken(String token) {
         if (token == null || !MessageDigest.isEqual(expectedToken, token.getBytes(StandardCharsets.UTF_8))) {
             throw new BizException(ResultCode.FORBIDDEN, "内部服务凭证无效");
diff --git a/firstleg/src/main/resources/openapi/firstleg-v1.yaml b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
index 811668338..1d9490311 100644
--- a/firstleg/src/main/resources/openapi/firstleg-v1.yaml
+++ b/firstleg/src/main/resources/openapi/firstleg-v1.yaml
@@ -136,6 +136,17 @@ paths:
                 requireInboundCodePrefix: {type: boolean}
       responses:
         '200': {description: 成功时 data 返回 channelCode；requireInboundCodePrefix=true 时同时返回 inboundCodePrefix}
+  /internal/firstleg/v1/pricing/channels:
+    get:
+      summary: 查询指定客户和起运仓当前可用渠道
+      description: 仅供订单服务的旧系统导入解析使用，不经公网网关暴露。
+      security:
+        - internalServiceToken: []
+      parameters:
+        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: originWarehouseId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+      responses:
+        '200': {description: 返回当前有效价格簿中的渠道编码和名称}
   /internal/firstleg/v1/pricing/order-channel-changes/validate:
     post:
       summary: Order 提交渠道变更前校验 Firstleg 计价资格与费用可逆性
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index b6f008ce4..b30bb2b85 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -69,7 +69,7 @@ spring:
         - id: file-service
           uri: lb://file-service
           predicates:
-            - Path=/api/merchant/v1/files/**,/api/platform/v1/files/**
+            - Path=/api/merchant/v1/files/**,/api/platform/v1/files/**,/api/pda-updates/**
         - id: print-service
           uri: lb://print-service
           predicates:
@@ -161,6 +161,7 @@ baiyue:
     jwt-secret: ${JWT_SECRET:change-me-to-at-least-32-bytes-long-before-start}
     token-key-prefix: ${REDIS_TOKEN_KEY_PREFIX:baiyue:auth}
     permit-paths:
+      - /api/pda-updates/**
       - /api/auth/login
       - /api/auth/register
       - /api/auth/refresh
diff --git a/iam/src/main/resources/db/phase1-admin-rbac.sql b/iam/src/main/resources/db/phase1-admin-rbac.sql
index 6b000fdd7..7a9917d00 100644
--- a/iam/src/main/resources/db/phase1-admin-rbac.sql
+++ b/iam/src/main/resources/db/phase1-admin-rbac.sql
@@ -131,18 +131,19 @@ VALUES
   (5102024, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:edit', '平台编辑订单草稿', NULL, NULL, 100, 'ACTIVE', 0),
   (5102025, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:submit', '平台代客提交订单', NULL, NULL, 110, 'ACTIVE', 0),
   (5102026, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:export', '导出订单列表', NULL, NULL, 120, 'ACTIVE', 0),
-  (5102027, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:declaration:edit', '修改订单申报与运营预估', NULL, NULL, 130, 'ACTIVE', 0)
+  (5102027, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:declaration:edit', '修改订单申报与运营预估', NULL, NULL, 130, 'ACTIVE', 0),
+  (5102028, 0, 'PLATFORM', 'BUTTON', 5102010, 'platform:order:import', '导入旧系统订单', NULL, NULL, 140, 'ACTIVE', 0)
 ON DUPLICATE KEY UPDATE
   permission_name = VALUES(permission_name), parent_id = VALUES(parent_id), status = 'ACTIVE', deleted = 0;
 
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
 SELECT 4000001, id, 0 FROM iam_permission
-WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)
+WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027, 5102028)
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
 
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
 SELECT 4000003, id, 0 FROM iam_permission
-WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)
+WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027, 5102028)
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
 
 INSERT INTO iam_membership_role (membership_id, role_id, tenant_id) VALUES
@@ -150,6 +151,13 @@ INSERT INTO iam_membership_role (membership_id, role_id, tenant_id) VALUES
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
 
 -- Full administrator roles receive all phase-one permissions in their application scope.
+INSERT INTO iam_permission
+  (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, deleted)
+VALUES
+  (5101060, 0, 'PLATFORM', 'MENU', 5101000, 'platform:pda-release:list', 'PDA版本', '/system/pda-releases', NULL, 60, 'ACTIVE', 0),
+  (5101061, 0, 'PLATFORM', 'BUTTON', 5101060, 'platform:pda-release:manage', '发布PDA版本', NULL, NULL, 10, 'ACTIVE', 0)
+ON DUPLICATE KEY UPDATE permission_name=VALUES(permission_name), parent_id=VALUES(parent_id), status='ACTIVE', deleted=0;
+
 INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
 SELECT 4000001, id, 0 FROM iam_permission
 WHERE app_code = 'PLATFORM' AND tenant_id = 0 AND permission_type IN ('MENU', 'BUTTON')
diff --git a/order/AGENTS.md b/order/AGENTS.md
index 045a0f685..d6c52ef40 100644
--- a/order/AGENTS.md
+++ b/order/AGENTS.md
@@ -21,6 +21,7 @@
 | 订单编排/状态/幂等 | `service/OrderApplicationService.java`、`entity/OrderStatus.java` |
 | 海外派送完成内部回写 | `controller/InternalOrderFulfillmentCompletionController.java`、`service/OrderFulfillmentCompletionService.java`；只接受 Firstleg 内部服务身份和已校验的来源订单/入仓码快照，幂等将对应订单推进为 `COMPLETED` 并写状态历史 |
 | 商户订单列表、批量草稿与中文 XLSX 导入 | `service/MerchantInboundOrderListService.java`、`MerchantBatchDraftService.java`、`MerchantBatchDraftItemService.java`、`MerchantBatchImportService.java`；动态目录客户端 `client/MerchantWarehouseCatalogClient.java`、`MerchantPricingCatalogClient.java`，客户地址由 `CustomerAddressService.java` 提供；接口见 `controller/MerchantFirstLegOrderController.java` 的 `/batch-imports/template`、`/batch-imports` |
+| 平台旧系统订单导入 | `controller/PlatformFirstLegOrderController.java` 的 `/legacy-import`、`service/PlatformLegacyOrderImportService.java`；固定按名称精确解析启用客户“IT测试公司”，保留旧入仓码，按内部仓库目录和该客户当前价格簿逐行校验，成功行直接进入 `SUBMITTED` 待审核；一件代发缺 SKU 的行失败，普通 FBA 缺 SKU 时使用稳定 `LEGACY-{入仓码}` 测试占位码 |
 | 入库号生成 | `config/InboundCodeModeProvider.java`、`mapper/InboundCodeSequenceMapper.java`、`repository/OrderRepository.java`、`service/OrderApplicationService.java` |
 | 下单计价渠道校验 | `service/OrderPricingChannelGuard.java`、`client/FirstlegPricingClient.java` |
 | 下单仓库主数据守卫 | `service/OrderMasterDataGuard.java`、`client/WarehouseClient.java`；校验公共收货仓、目的仓类型、状态、地址与收货能力，并保存服务端快照 |
diff --git a/order/src/main/java/com/baiyue/order/client/LegacyImportPricingClient.java b/order/src/main/java/com/baiyue/order/client/LegacyImportPricingClient.java
new file mode 100644
index 000000000..26f23af25
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/client/LegacyImportPricingClient.java
@@ -0,0 +1,20 @@
+package com.baiyue.order.client;
+
+import com.baiyue.common.core.api.ApiResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = "firstleg-service", contextId = "legacyImportPricingClient",
+    url = "${baiyue.clients.firstleg.url:}", path = "/internal/firstleg/v1/pricing")
+public interface LegacyImportPricingClient {
+    @GetMapping("/channels")
+    ApiResponse<List<Channel>> channels(@RequestHeader("X-Internal-Service-Token") String token,
+                                       @RequestParam("tenantId") long tenantId,
+                                       @RequestParam("originWarehouseId") long originWarehouseId);
+
+    record Channel(String channelCode, String channelName) { }
+}
diff --git a/order/src/main/java/com/baiyue/order/client/LegacyImportWarehouseClient.java b/order/src/main/java/com/baiyue/order/client/LegacyImportWarehouseClient.java
new file mode 100644
index 000000000..5e0d264f2
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/client/LegacyImportWarehouseClient.java
@@ -0,0 +1,18 @@
+package com.baiyue.order.client;
+
+import com.baiyue.common.core.api.ApiResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+import java.util.List;
+
+@FeignClient(name = "warehouse-service", contextId = "legacyImportWarehouseClient",
+    url = "${baiyue.clients.warehouse.url:}", path = "/internal/warehouses")
+public interface LegacyImportWarehouseClient {
+    @GetMapping("/order-catalog")
+    ApiResponse<List<Item>> catalog(@RequestHeader("X-Internal-Service-Token") String token);
+
+    record Item(Long id, String warehouseCode, String warehouseName, String warehouseType,
+                String countryCode) { }
+}
diff --git a/order/src/main/java/com/baiyue/order/client/TenantEligibilityClient.java b/order/src/main/java/com/baiyue/order/client/TenantEligibilityClient.java
index 04666f955..178bb8333 100644
--- a/order/src/main/java/com/baiyue/order/client/TenantEligibilityClient.java
+++ b/order/src/main/java/com/baiyue/order/client/TenantEligibilityClient.java
@@ -22,6 +22,14 @@ public interface TenantEligibilityClient {
             @RequestParam("size") long size,
             @RequestParam("customerId") long customerId);
 
+    @GetMapping("/finance-customers")
+    ApiResponse<PageResult<CustomerSummary>> customerSummaryByKeyword(
+            @RequestHeader("X-Internal-Service-Token") String internalToken,
+            @RequestParam("page") long page,
+            @RequestParam("size") long size,
+            @RequestParam("keyword") String keyword,
+            @RequestParam("status") String status);
+
     record EligibilityResponse(boolean eligible, String tenantStatus, String reason) { }
     record CustomerSummary(Long id, String tenantCode, String tenantName, String status,
                            String contactName, String contactPhone) { }
diff --git a/order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java b/order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
index 419b2d182..e94f99327 100644
--- a/order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
+++ b/order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
@@ -19,6 +19,8 @@ import com.baiyue.order.service.OrderApplicationService;
 import com.baiyue.order.service.OrderScopeGuard;
 import com.baiyue.order.service.InboundCodeAssociationService;
 import com.baiyue.order.service.BatchOrderReviewPreviewService;
+import com.baiyue.order.service.PlatformLegacyOrderImportService;
+import com.baiyue.order.dto.PlatformLegacyOrderImportDtos;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
@@ -36,6 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,6 +60,20 @@ public class PlatformFirstLegOrderController {
     private InboundCodeAssociationService inboundCodeAssociations;
     @Resource
     private BatchOrderReviewPreviewService batchReviewPreview;
+    @Resource
+    private PlatformLegacyOrderImportService legacyImport;
+
+    @BusinessAudit(event = "ORDER_LEGACY_IMPORT", resourceType = "FIRST_LEG_ORDER", description = "导入旧系统订单")
+    @PostMapping(value = "/legacy-import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PreAuthorize("hasAuthority('platform:order:import')")
+    @Operation(summary = "导入旧系统订单", description = "固定归属 IT测试公司，保留旧入仓码并逐行创建待审核订单。")
+    public ApiResponse<PlatformLegacyOrderImportDtos.Response> importLegacy(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @RequestHeader("Idempotency-Key") String idempotencyKey,
+        @RequestPart("file") MultipartFile file) {
+        OrderScopeGuard.platform(user);
+        return ApiResponse.success(legacyImport.importFile(user.userId(), user.username(), idempotencyKey, file));
+    }
 
     @GetMapping("/inbound-code-policy")
     @PreAuthorize("hasAnyAuthority('platform:order:list', 'platform:order:create', 'platform:order:edit', 'platform:order:submit')")
diff --git a/order/src/main/java/com/baiyue/order/dto/PlatformLegacyOrderImportDtos.java b/order/src/main/java/com/baiyue/order/dto/PlatformLegacyOrderImportDtos.java
new file mode 100644
index 000000000..d6aa0e0c0
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/dto/PlatformLegacyOrderImportDtos.java
@@ -0,0 +1,19 @@
+package com.baiyue.order.dto;
+
+import java.util.List;
+
+public final class PlatformLegacyOrderImportDtos {
+    private PlatformLegacyOrderImportDtos() { }
+
+    public record Response(int total, int succeeded, int failed, List<Result> items) { }
+
+    public record Result(int excelRow, boolean success, String legacyInboundCode,
+                         Long orderId, String orderNo, String errorMessage) {
+        public static Result success(int row, String code, Long orderId, String orderNo) {
+            return new Result(row, true, code, orderId, orderNo, null);
+        }
+        public static Result failure(int row, String code, String message) {
+            return new Result(row, false, code, null, null, message);
+        }
+    }
+}
diff --git a/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java b/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
index 3b349c2f7..2e72adc96 100644
--- a/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
+++ b/order/src/main/java/com/baiyue/order/service/OrderApplicationService.java
@@ -76,13 +76,13 @@ public class OrderApplicationService {
         if (idempotency.replayed()) {
             return idempotency.record().getResultOrderId();
         }
-        Long orderId = createDraftInternal(tenantId, userId, username, request);
+        Long orderId = createDraftInternal(tenantId, userId, username, request, false);
         completeIdempotency(idempotency, orderId);
         return orderId;
     }
 
     private Long createDraftInternal(long tenantId, long userId, String username,
-                                     OrderRequests.SaveRequest request) {
+                                     OrderRequests.SaveRequest request, boolean allowLegacyInboundCode) {
         AddressSnapshots addressSnapshots = resolveCustomerAddresses(tenantId, request);
         validateWoodInspection(request);
         validateRequestCargoQuantities(request.cargoes(), false);
@@ -94,7 +94,7 @@ public class OrderApplicationService {
         long orderId = IdWorker.getId();
         order.setId(orderId); order.setTenantId(tenantId); order.setOrderNo(nextNo(orderId));
         order.setStatus(OrderStatus.DRAFT);
-        apply(order, tenantId, request, snapshots, addressSnapshots);
+        apply(order, tenantId, request, snapshots, addressSnapshots, allowLegacyInboundCode);
         order.setCreatedBy(userId); order.setUpdatedBy(userId);
         try {
             repository.insertOrder(order);
@@ -106,6 +106,19 @@ public class OrderApplicationService {
         return order.getId();
     }
 
+    /** 旧系统并行期专用：保留旧入仓码，并在同一事务中直接创建为待审核订单。 */
+    @Transactional
+    public Long importLegacySubmittedOrder(long tenantId, long userId, String username,
+                                           OrderRequests.SaveRequest request, String idempotencyKey) {
+        IdempotencyContext idempotency = beginIdempotency(tenantId, userId, "IMPORT_LEGACY_ORDER", 0L,
+            idempotencyKey, requestHash("IMPORT_LEGACY_ORDER", request));
+        if (idempotency.replayed()) return idempotency.record().getResultOrderId();
+        Long orderId = createDraftInternal(tenantId, userId, username, request, true);
+        transit(tenantId, userId, username, orderId, OrderStatus.SUBMITTED, null);
+        completeIdempotency(idempotency, orderId);
+        return orderId;
+    }
+
     @Transactional
     public void updateDraft(long tenantId, long userId, long id, OrderRequests.SaveRequest request) {
         updateOrderData(tenantId, userId, id, request, false);
@@ -137,7 +150,7 @@ public class OrderApplicationService {
         }
         requirePricingChannel(tenantId, request.receivingWarehouseId(), request.channelCode(),
             request.destinationType());
-        apply(order, tenantId, request, snapshots, addressSnapshots); order.setStatus(OrderStatus.DRAFT); order.setUpdatedBy(userId);
+        apply(order, tenantId, request, snapshots, addressSnapshots, false); order.setStatus(OrderStatus.DRAFT); order.setUpdatedBy(userId);
         if (before == OrderStatus.SUBMITTED) {
             order.setStatus(OrderStatus.SUBMITTED);
         }
@@ -575,9 +588,10 @@ public class OrderApplicationService {
         };
     }
     private void apply(OrderEntity order, long tenantId, OrderRequests.SaveRequest request,
-                       OrderMasterDataGuard.Snapshots snapshots, AddressSnapshots addresses) {
+                       OrderMasterDataGuard.Snapshots snapshots, AddressSnapshots addresses,
+                       boolean allowLegacyInboundCode) {
         order.setCustomerId(tenantId);
-        applyInboundCode(order, request.inboundCode());
+        applyInboundCode(order, request.inboundCode(), allowLegacyInboundCode);
         order.setCustomerName(request.customerName().trim());
         order.setTransportMode(request.transportMode()); order.setTradeTerm(request.tradeTerm());
         order.setDestinationCountryCode(addresses.privateDestination() != null
@@ -616,10 +630,10 @@ public class OrderApplicationService {
             ? snapshots.destination().warehouse().warehouseCode() : request.amazonWarehouseCode());
         order.setShipmentId(request.shipmentId()); order.setReferenceId(request.referenceId());
     }
-    private void applyInboundCode(OrderEntity order, String requestedCode) {
+    private void applyInboundCode(OrderEntity order, String requestedCode, boolean allowLegacyInboundCode) {
         String normalized = StringUtils.hasText(requestedCode)
             ? requestedCode.trim().toUpperCase(Locale.ROOT) : null;
-        if (!legacyManualMode()) {
+        if (!legacyManualMode() && !allowLegacyInboundCode) {
             if (normalized != null && !normalized.equals(order.getInboundCode())) {
                 throw new BizException(ResultCode.VALIDATION_FAILED, "当前系统由新系统自动生成入仓码，请勿人工填写");
             }
diff --git a/order/src/main/java/com/baiyue/order/service/PlatformLegacyOrderImportService.java b/order/src/main/java/com/baiyue/order/service/PlatformLegacyOrderImportService.java
new file mode 100644
index 000000000..510c75797
--- /dev/null
+++ b/order/src/main/java/com/baiyue/order/service/PlatformLegacyOrderImportService.java
@@ -0,0 +1,274 @@
+package com.baiyue.order.service;
+
+import com.baiyue.common.core.api.ResultCode;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.order.client.LegacyImportPricingClient;
+import com.baiyue.order.client.LegacyImportWarehouseClient;
+import com.baiyue.order.client.TenantEligibilityClient;
+import com.baiyue.order.dto.OrderRequests;
+import com.baiyue.order.dto.PlatformLegacyOrderImportDtos;
+import jakarta.annotation.Resource;
+import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.math.BigDecimal;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+@Service
+public class PlatformLegacyOrderImportService {
+    private static final String FIXED_CUSTOMER = "IT测试公司";
+    private static final int MAX_ROWS = 200;
+    private static final long MAX_BYTES = 5L * 1024 * 1024;
+    private static final List<String> HEADERS = List.of("客户公司", "入仓码", "订单状态", "渠道", "品名/材质",
+        "买单/退税", "目的仓", "邮编", "货件编号", "FBA仓追踪编码", "SKU", "总箱数", "预报毛重",
+        "预报体积", "货重比", "交货仓", "备注");
+    private static final ThreadLocal<DataFormatter> FORMATTER =
+        ThreadLocal.withInitial(() -> new DataFormatter(Locale.SIMPLIFIED_CHINESE));
+
+    @Resource private TenantEligibilityClient tenants;
+    @Resource private LegacyImportWarehouseClient warehouses;
+    @Resource private LegacyImportPricingClient pricing;
+    @Resource private OrderApplicationService orders;
+    @Value("${baiyue.security.internal-service-token:}") private String token;
+
+    public PlatformLegacyOrderImportDtos.Response importFile(long userId, String username,
+                                                              String idempotencyKey, MultipartFile file) {
+        byte[] content = read(file);
+        Customer customer = fixedCustomer();
+        Catalog catalog = catalog(customer.id());
+        List<ParsedRow> rows = parse(content, customer, catalog);
+        List<PlatformLegacyOrderImportDtos.Result> results = new ArrayList<>();
+        int succeeded = 0;
+        for (ParsedRow row : rows) {
+            if (row.error() != null) {
+                results.add(PlatformLegacyOrderImportDtos.Result.failure(row.excelRow(), row.legacyInboundCode(), row.error()));
+                continue;
+            }
+            try {
+                Long orderId = orders.importLegacySubmittedOrder(customer.id(), userId, username, row.request(),
+                    derivedKey(idempotencyKey, row.legacyInboundCode()));
+                var saved = orders.detail(customer.id(), orderId).order();
+                results.add(PlatformLegacyOrderImportDtos.Result.success(row.excelRow(), row.legacyInboundCode(),
+                    orderId, saved.getOrderNo()));
+                succeeded++;
+            } catch (BizException exception) {
+                results.add(PlatformLegacyOrderImportDtos.Result.failure(row.excelRow(), row.legacyInboundCode(),
+                    exception.getMessage()));
+            }
+        }
+        return new PlatformLegacyOrderImportDtos.Response(rows.size(), succeeded, rows.size() - succeeded, results);
+    }
+
+    private List<ParsedRow> parse(byte[] content, Customer customer, Catalog catalog) {
+        try (var workbook = new XSSFWorkbook(new ByteArrayInputStream(content))) {
+            var sheet = workbook.getSheetAt(0);
+            Row header = sheet.getRow(2);
+            if (header == null) throw invalid("未找到旧系统表头（应位于第 3 行）");
+            for (int i = 0; i < HEADERS.size(); i++) {
+                if (!HEADERS.get(i).equals(text(header, i))) throw invalid("旧系统 Excel 表头不正确：缺少“" + HEADERS.get(i) + "”");
+            }
+            List<ParsedRow> rows = new ArrayList<>();
+            for (int index = 3; index <= sheet.getLastRowNum(); index++) {
+                Row source = sheet.getRow(index);
+                if (source == null || !StringUtils.hasText(text(source, 1))) continue;
+                if (rows.size() >= MAX_ROWS) throw invalid("单次最多导入 " + MAX_ROWS + " 条订单");
+                try { rows.add(new ParsedRow(index + 1, text(source, 1), request(source, customer, catalog), null)); }
+                catch (BizException exception) { rows.add(new ParsedRow(index + 1, text(source, 1), null, exception.getMessage())); }
+            }
+            if (rows.isEmpty()) throw invalid("Excel 没有订单数据行");
+            return rows;
+        } catch (BizException exception) { throw exception; }
+        catch (Exception exception) { throw invalid("Excel 文件损坏或格式不正确"); }
+    }
+
+    private OrderRequests.SaveRequest request(Row row, Customer customer, Catalog catalog) {
+        String inboundCode = required(row, 1, "入仓码").toUpperCase(Locale.ROOT);
+        if (!inboundCode.matches("[A-Za-z0-9._:-]+")) throw invalid("入仓码格式不正确");
+        String receivingName = required(row, 15, "交货仓");
+        var receiving = uniqueWarehouse(catalog.domestic(), receivingName, "国内收货仓");
+        String destinationName = required(row, 6, "目的仓");
+        String destinationType;
+        String fulfillmentType = "STANDARD";
+        Long destinationId = null;
+        String destinationWarehouseName;
+        String destinationCountry = "US";
+        String amazonCode = null;
+        if ("私人仓".equals(destinationName)) {
+            destinationType = "PRIVATE";
+            destinationWarehouseName = "私人仓 " + required(row, 7, "邮编");
+        } else if (destinationName.endsWith("一件代发")) {
+            destinationType = "OVERSEAS";
+            fulfillmentType = "ONE_CLICK_DROPSHIP";
+            var warehouse = uniqueWarehouse(catalog.overseas(), destinationName.replace("一件代发", ""), "海外仓目的仓");
+            destinationId = warehouse.id(); destinationWarehouseName = warehouse.warehouseName();
+            destinationCountry = warehouse.countryCode();
+        } else {
+            destinationType = "FBA";
+            var warehouse = uniqueWarehouse(catalog.fba(), destinationName, "FBA目的仓");
+            destinationId = warehouse.id(); destinationWarehouseName = warehouse.warehouseName();
+            destinationCountry = warehouse.countryCode(); amazonCode = warehouse.warehouseCode();
+        }
+        var channel = uniqueChannel(catalog.channels(receiving.id()), required(row, 3, "渠道"));
+        CargoText cargoText = cargoText(required(row, 4, "品名/材质"));
+        int packages = positiveInt(required(row, 11, "总箱数"), "总箱数");
+        BigDecimal grossWeight = positiveDecimal(required(row, 12, "预报毛重"), "预报毛重");
+        BigDecimal volume = positiveDecimal(required(row, 13, "预报体积"), "预报体积");
+        List<SkuEntry> skuEntries = skuEntries(text(row, 10));
+        if ("ONE_CLICK_DROPSHIP".equals(fulfillmentType) && skuEntries.isEmpty()) {
+            throw invalid("一件代发订单缺少 SKU");
+        }
+        String shipmentId = cleanReference(text(row, 8));
+        String referenceId = cleanReference(text(row, 9));
+        String remark = joinRemark(text(row, 16), "旧系统客户：" + text(row, 0));
+        List<OrderRequests.Cargo> cargoes = new ArrayList<>();
+        if ("ONE_CLICK_DROPSHIP".equals(fulfillmentType)) {
+            int skuPackages = skuEntries.stream().mapToInt(SkuEntry::packages).sum();
+            if (skuPackages != packages) throw invalid("SKU 明细箱数合计与总箱数不一致");
+            for (int index = 0; index < skuEntries.size(); index++) {
+                SkuEntry entry = skuEntries.get(index);
+                BigDecimal ratio = BigDecimal.valueOf(entry.packages()).divide(BigDecimal.valueOf(packages), 8, java.math.RoundingMode.HALF_UP);
+                BigDecimal lineWeight = index == skuEntries.size() - 1
+                    ? grossWeight.subtract(cargoes.stream().map(OrderRequests.Cargo::grossWeightKg).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    : grossWeight.multiply(ratio).setScale(3, java.math.RoundingMode.HALF_UP);
+                BigDecimal lineVolume = index == skuEntries.size() - 1
+                    ? volume.subtract(cargoes.stream().map(OrderRequests.Cargo::volumeCbm).reduce(BigDecimal.ZERO, BigDecimal::add))
+                    : volume.multiply(ratio).setScale(4, java.math.RoundingMode.HALF_UP);
+                cargoes.add(cargo(cargoText, entry.packages(), lineWeight, lineVolume, entry.sku(), null, null));
+            }
+        } else {
+            String sku = skuEntries.isEmpty() && "FBA".equals(destinationType) ? "LEGACY-" + inboundCode
+                : skuEntries.isEmpty() ? null : skuEntries.get(0).sku();
+            cargoes.add(cargo(cargoText, packages, grossWeight, volume, sku, shipmentId, referenceId));
+        }
+        OrderRequests.Party receiver = "PRIVATE".equals(destinationType)
+            ? new OrderRequests.Party(customer.name(), "旧系统导入", "未提供", null, "US", null,
+                "未提供", null, destinationWarehouseName, required(row, 7, "邮编"))
+            : null;
+        return new OrderRequests.SaveRequest(customer.id(), customer.name(), "SEA", "FOB", destinationCountry,
+            destinationId, destinationWarehouseName, null, remark, null, receiver, cargoes, "SELF_TRUCK", null,
+            receiving.id(), receiving.warehouseName(), channel.channelCode(), channel.channelName(), null, null,
+            "买单".equals(required(row, 5, "买单/退税")) ? "BUY_DECLARATION" : "TAX_REFUND",
+            channel.channelName().contains("包税") && !channel.channelName().contains("不包税") ? "TAX_INCLUDED" : "TAX_EXCLUDED",
+            "LCL", false, destinationType, amazonCode, shipmentId, referenceId, inboundCode, fulfillmentType,
+            "ONE_CLICK_DROPSHIP".equals(fulfillmentType) ? referenceId : null, null, null);
+    }
+
+    private Customer fixedCustomer() {
+        try {
+            var response = tenants.customerSummaryByKeyword(token, 1, 200, FIXED_CUSTOMER, "ACTIVE");
+            if (response == null || !response.successful() || response.data() == null) throw unavailable("固定客户资料暂不可用");
+            var matches = response.data().records().stream().filter(value -> FIXED_CUSTOMER.equals(value.tenantName())).toList();
+            if (matches.size() != 1) throw invalid("固定客户“" + FIXED_CUSTOMER + "”不存在、未启用或名称不唯一");
+            return new Customer(matches.get(0).id(), matches.get(0).tenantName());
+        } catch (BizException exception) { throw exception; }
+        catch (RuntimeException exception) { throw unavailable("固定客户资料暂不可用"); }
+    }
+
+    private Catalog catalog(long tenantId) {
+        try {
+            var response = warehouses.catalog(token);
+            if (response == null || !response.successful() || response.data() == null) throw unavailable("仓库目录暂不可用");
+            var domestic = response.data().stream().filter(v -> "DOMESTIC".equals(v.warehouseType())).toList();
+            Map<Long, List<LegacyImportPricingClient.Channel>> channels = new LinkedHashMap<>();
+            for (var warehouse : domestic) channels.put(warehouse.id(), channels(tenantId, warehouse.id()));
+            return new Catalog(domestic,
+                response.data().stream().filter(v -> "FBA".equals(v.warehouseType())).toList(),
+                response.data().stream().filter(v -> "OVERSEAS".equals(v.warehouseType())).toList(), channels);
+        } catch (BizException exception) { throw exception; }
+        catch (RuntimeException exception) { throw unavailable("仓库目录暂不可用"); }
+    }
+
+    private List<LegacyImportPricingClient.Channel> channels(long tenantId, long warehouseId) {
+        var response = pricing.channels(token, tenantId, warehouseId);
+        if (response == null || !response.successful() || response.data() == null) throw unavailable("渠道目录暂不可用");
+        return response.data();
+    }
+
+    private byte[] read(MultipartFile file) {
+        if (file == null || file.isEmpty()) throw invalid("请选择旧系统导出的 Excel 文件");
+        if (file.getSize() > MAX_BYTES) throw invalid("Excel 文件不能超过 5MB");
+        String name = file.getOriginalFilename();
+        if (!StringUtils.hasText(name) || !name.toLowerCase(Locale.ROOT).endsWith(".xlsx")) throw invalid("仅支持 .xlsx 文件");
+        try { return file.getBytes(); } catch (Exception exception) { throw invalid("无法读取 Excel 文件"); }
+    }
+
+    private static LegacyImportWarehouseClient.Item uniqueWarehouse(List<LegacyImportWarehouseClient.Item> values,
+                                                                     String source, String label) {
+        String normalized = normalize(source);
+        List<LegacyImportWarehouseClient.Item> exact = values.stream().filter(value ->
+            normalized.equals(normalize(value.warehouseCode())) || normalized.equals(normalize(value.warehouseName()))).toList();
+        List<LegacyImportWarehouseClient.Item> matches = exact.isEmpty() ? values.stream().filter(value ->
+            normalize(value.warehouseName()).contains(normalized) || normalized.contains(normalize(value.warehouseName()))).toList() : exact;
+        if (matches.size() != 1) throw invalid(label + "“" + source + "”无法唯一匹配当前主数据");
+        return matches.get(0);
+    }
+
+    private static LegacyImportPricingClient.Channel uniqueChannel(List<LegacyImportPricingClient.Channel> values, String source) {
+        String normalized = normalize(source);
+        List<LegacyImportPricingClient.Channel> exact = values.stream().filter(value -> normalized.equals(normalize(value.channelName()))).toList();
+        if (exact.size() != 1) throw invalid("渠道“" + source + "”无法唯一匹配 IT测试公司的当前价格簿");
+        return exact.get(0);
+    }
+
+    private static CargoText cargoText(String source) {
+        String cleaned = source.replaceAll("-\\d+件\\s*$", "").trim();
+        String[] parts = cleaned.split("-", 2);
+        return new CargoText(parts[0].trim(), parts.length > 1 ? parts[1].trim() : null);
+    }
+
+    private static OrderRequests.Cargo cargo(CargoText text, int packages, BigDecimal grossWeight,
+                                             BigDecimal volume, String sku, String shipmentId, String referenceId) {
+        return new OrderRequests.Cargo(text.name(), null, "CARTON", packages, grossWeight, volume,
+            null, null, null, null, null, false, null, sku, null, null, null, 1, packages,
+            null, null, text.material(), null, null, null, null, null, null,
+            shipmentId, referenceId, null, false, null);
+    }
+
+    private static List<SkuEntry> skuEntries(String source) {
+        if (!StringUtils.hasText(source)) return List.of();
+        List<SkuEntry> result = new ArrayList<>();
+        for (String line : source.split("\\R")) {
+            String value = line.trim();
+            if (value.isBlank() || "/".equals(value)) continue;
+            var matcher = java.util.regex.Pattern.compile("^(.+?)-(\\d+)件$").matcher(value);
+            if (matcher.matches()) result.add(new SkuEntry(matcher.group(1).trim(), positiveInt(matcher.group(2), "SKU 箱数")));
+            else result.add(new SkuEntry(value, 1));
+        }
+        return result;
+    }
+
+    private static String text(Row row, int column) { return row == null ? "" : FORMATTER.get().formatCellValue(row.getCell(column)).trim(); }
+    private static String required(Row row, int column, String label) { String value = text(row, column); if (!StringUtils.hasText(value)) throw invalid(label + "不能为空"); return value; }
+    private static int positiveInt(String value, String label) { try { int parsed = new BigDecimal(value).intValueExact(); if (parsed < 1) throw new NumberFormatException(); return parsed; } catch (Exception e) { throw invalid(label + "必须为正整数"); } }
+    private static BigDecimal positiveDecimal(String value, String label) { try { BigDecimal parsed = new BigDecimal(value); if (parsed.signum() <= 0) throw new NumberFormatException(); return parsed; } catch (Exception e) { throw invalid(label + "必须大于 0"); } }
+    private static String cleanReference(String value) { if (!StringUtils.hasText(value)) return null; String first = Arrays.stream(value.split("\\R")).map(String::trim).filter(v -> !v.isBlank()).findFirst().orElse(""); first = first.replaceAll("-\\d+件$", ""); return "/".equals(first) ? null : first; }
+    private static String joinRemark(String left, String right) { return StringUtils.hasText(left) ? left.trim() + "；" + right : right; }
+    private static String normalize(String value) { return value == null ? "" : value.replaceAll("[\\s（）()_-]", "").toUpperCase(Locale.ROOT); }
+    private static String derivedKey(String batchKey, String inboundCode) { try { byte[] bytes = MessageDigest.getInstance("SHA-256").digest((batchKey.trim() + ":" + inboundCode).getBytes(java.nio.charset.StandardCharsets.UTF_8)); return java.util.HexFormat.of().formatHex(bytes); } catch (Exception e) { throw unavailable("导入幂等键生成失败"); } }
+    private static BizException invalid(String message) { return new BizException(ResultCode.VALIDATION_FAILED, message); }
+    private static BizException unavailable(String message) { return new BizException(ResultCode.SERVICE_UNAVAILABLE, message); }
+
+    private record Customer(long id, String name) { }
+    private record ParsedRow(int excelRow, String legacyInboundCode, OrderRequests.SaveRequest request, String error) { }
+    private record CargoText(String name, String material) { }
+    private record SkuEntry(String sku, int packages) { }
+    private record Catalog(List<LegacyImportWarehouseClient.Item> domestic, List<LegacyImportWarehouseClient.Item> fba,
+                           List<LegacyImportWarehouseClient.Item> overseas,
+                           Map<Long, List<LegacyImportPricingClient.Channel>> channelCache) {
+        List<LegacyImportPricingClient.Channel> channels(long warehouseId) {
+            return channelCache.getOrDefault(warehouseId, List.of());
+        }
+    }
+}
diff --git a/order/src/main/resources/openapi/order-v1.yaml b/order/src/main/resources/openapi/order-v1.yaml
index 3270cf299..3d3aa02da 100644
--- a/order/src/main/resources/openapi/order-v1.yaml
+++ b/order/src/main/resources/openapi/order-v1.yaml
@@ -593,6 +593,25 @@ paths:
             application/json:
               schema: {$ref: '#/components/schemas/BatchReviewPreviewEnvelope'}
         '403': {description: 需要平台身份和 platform:order:approve 权限}
+  /api/platform/v1/orders/first-leg/legacy-import:
+    post:
+      tags: [Platform first-leg orders]
+      summary: 导入旧系统订单
+      description: 固定归属 IT测试公司；保留旧入仓码，按当前仓库和价格簿逐行校验，成功行直接进入待审核。
+      parameters:
+        - $ref: '#/components/parameters/IdempotencyKey'
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              required: [file]
+              properties:
+                file: {type: string, format: binary}
+      responses:
+        '200': {description: 返回逐行成功、失败及错误原因}
+        '403': {description: 需要平台身份和 platform:order:import 权限}
   /api/platform/v1/orders/first-leg/batch-approve:
     post:
       tags: [Platform first-leg orders]
diff --git a/order/src/test/java/com/baiyue/order/controller/DomesticWarehouseOrderExportPermissionSqlContractTest.java b/order/src/test/java/com/baiyue/order/controller/DomesticWarehouseOrderExportPermissionSqlContractTest.java
index 52bbba672..4a514926c 100644
--- a/order/src/test/java/com/baiyue/order/controller/DomesticWarehouseOrderExportPermissionSqlContractTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/DomesticWarehouseOrderExportPermissionSqlContractTest.java
@@ -28,7 +28,7 @@ class DomesticWarehouseOrderExportPermissionSqlContractTest {
                 .contains("platform:download:list")
                 .contains("4000003");
         }
-        assertThat(iamSeed).contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)");
+        assertThat(iamSeed).contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027, 5102028)");
         assertThat(unified)
             .contains("VALUES (4000001,5102026,0,CURRENT_TIMESTAMP(3))")
             .contains("VALUES (4000003,5102026,0,CURRENT_TIMESTAMP(3))")
diff --git a/order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java b/order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
index 36c238443..447ac09d4 100644
--- a/order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
@@ -7,6 +7,7 @@ import com.baiyue.order.dto.UnifiedOrderQuery;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -49,6 +50,8 @@ class OrderControllerPermissionTest {
             AuthenticatedUser.class, long.class, OrderRequests.BatchReviewRequest.class);
         assertAuthority(PlatformFirstLegOrderController.class, "batchReject", "hasAuthority('platform:order:reject')",
             AuthenticatedUser.class, long.class, OrderRequests.BatchRejectRequest.class);
+        assertAuthority(PlatformFirstLegOrderController.class, "importLegacy", "hasAuthority('platform:order:import')",
+            AuthenticatedUser.class, String.class, MultipartFile.class);
     }
 
     @Test
diff --git a/order/src/test/java/com/baiyue/order/controller/OrderDeclarationUpdateContractTest.java b/order/src/test/java/com/baiyue/order/controller/OrderDeclarationUpdateContractTest.java
index 10b822081..ef4582c7a 100644
--- a/order/src/test/java/com/baiyue/order/controller/OrderDeclarationUpdateContractTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/OrderDeclarationUpdateContractTest.java
@@ -107,7 +107,7 @@ class OrderDeclarationUpdateContractTest {
             .contains("values (4000003,5102027,0,current_timestamp(3))");
         assertThat(iamSource)
             .contains("platform:order:declaration:edit")
-            .contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027)");
+            .contains("WHERE id IN (5102019, 5102024, 5102025, 5102026, 5102027, 5102028)");
     }
 
     @SuppressWarnings("unchecked")
diff --git a/order/src/test/java/com/baiyue/order/controller/PlatformOrderPageControllerTest.java b/order/src/test/java/com/baiyue/order/controller/PlatformOrderPageControllerTest.java
index 28d51a583..023096295 100644
--- a/order/src/test/java/com/baiyue/order/controller/PlatformOrderPageControllerTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/PlatformOrderPageControllerTest.java
@@ -10,6 +10,7 @@ import com.baiyue.order.entity.OrderStatus;
 import com.baiyue.order.service.OrderApplicationService;
 import com.baiyue.order.service.InboundCodeAssociationService;
 import com.baiyue.order.service.BatchOrderReviewPreviewService;
+import com.baiyue.order.service.PlatformLegacyOrderImportService;
 import org.junit.jupiter.api.Test;
 import jakarta.annotation.Resource;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -32,6 +33,7 @@ class PlatformOrderPageControllerTest {
     @MockBean private OrderApplicationService service;
     @MockBean private InboundCodeAssociationService inboundCodeAssociations;
     @MockBean private BatchOrderReviewPreviewService batchReviewPreview;
+    @MockBean private PlatformLegacyOrderImportService legacyImport;
     @Resource private PlatformFirstLegOrderController controller;
     private final OrderRequests.QueryRequest query = new OrderRequests.QueryRequest(
         null, null, null, null, null, null, 1, 20);
diff --git a/order/src/test/java/com/baiyue/order/service/PlatformLegacyOrderImportServiceTest.java b/order/src/test/java/com/baiyue/order/service/PlatformLegacyOrderImportServiceTest.java
new file mode 100644
index 000000000..027136a7a
--- /dev/null
+++ b/order/src/test/java/com/baiyue/order/service/PlatformLegacyOrderImportServiceTest.java
@@ -0,0 +1,109 @@
+package com.baiyue.order.service;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.order.client.LegacyImportPricingClient;
+import com.baiyue.order.client.LegacyImportWarehouseClient;
+import com.baiyue.order.client.TenantEligibilityClient;
+import com.baiyue.order.dto.OrderDetailResponse;
+import com.baiyue.order.dto.OrderRequests;
+import com.baiyue.order.entity.OrderEntity;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class PlatformLegacyOrderImportServiceTest {
+    private final TenantEligibilityClient tenants = mock(TenantEligibilityClient.class);
+    private final LegacyImportWarehouseClient warehouses = mock(LegacyImportWarehouseClient.class);
+    private final LegacyImportPricingClient pricing = mock(LegacyImportPricingClient.class);
+    private final OrderApplicationService orders = mock(OrderApplicationService.class);
+    private PlatformLegacyOrderImportService service;
+
+    @BeforeEach
+    void setUp() {
+        service = new PlatformLegacyOrderImportService();
+        ReflectionTestUtils.setField(service, "tenants", tenants);
+        ReflectionTestUtils.setField(service, "warehouses", warehouses);
+        ReflectionTestUtils.setField(service, "pricing", pricing);
+        ReflectionTestUtils.setField(service, "orders", orders);
+        ReflectionTestUtils.setField(service, "token", "internal-token");
+        var customer = new TenantEligibilityClient.CustomerSummary(88L, "IT", "IT测试公司", "ACTIVE", null, null);
+        when(tenants.customerSummaryByKeyword("internal-token", 1, 200, "IT测试公司", "ACTIVE"))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 200, 1, 1)));
+        when(warehouses.catalog("internal-token")).thenReturn(ApiResponse.success(List.of(
+            new LegacyImportWarehouseClient.Item(21L, "CN-YW", "义乌仓", "DOMESTIC", "CN"),
+            new LegacyImportWarehouseClient.Item(22L, "SCK4", "SCK4", "FBA", "US"),
+            new LegacyImportWarehouseClient.Item(23L, "US-LAX", "洛杉矶仓", "OVERSEAS", "US"))));
+        when(pricing.channels("internal-token", 88L, 21L)).thenReturn(ApiResponse.success(List.of(
+            new LegacyImportPricingClient.Channel("MATSON", "美森正班海卡包税"))));
+        when(orders.importLegacySubmittedOrder(anyLong(), anyLong(), anyString(), any(), anyString()))
+            .thenReturn(1001L, 1002L);
+        when(orders.detail(anyLong(), anyLong())).thenAnswer(invocation -> {
+            OrderEntity order = new OrderEntity();
+            order.setOrderNo("FL-" + invocation.getArgument(1));
+            return new OrderDetailResponse(order, List.of(), List.of(), List.of(), List.of());
+        });
+    }
+
+    @Test
+    void importsFbaAndSplitsDropshipSkuLinesForFixedCustomer() throws Exception {
+        var result = service.importFile(7L, "operator", "batch-key",
+            new MockMultipartFile("file", "legacy.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                workbook()));
+
+        assertThat(result.total()).isEqualTo(2);
+        assertThat(result.succeeded()).isEqualTo(2);
+        assertThat(result.failed()).isZero();
+        ArgumentCaptor<OrderRequests.SaveRequest> captor = ArgumentCaptor.forClass(OrderRequests.SaveRequest.class);
+        verify(orders, times(2)).importLegacySubmittedOrder(anyLong(), anyLong(), anyString(), captor.capture(), anyString());
+        OrderRequests.SaveRequest fba = captor.getAllValues().get(0);
+        assertThat(fba.customerName()).isEqualTo("IT测试公司");
+        assertThat(fba.inboundCode()).isEqualTo("ZBYHK2609200988");
+        assertThat(fba.destinationType()).isEqualTo("FBA");
+        assertThat(fba.cargoes().get(0).skuNo()).isEqualTo("LEGACY-ZBYHK2609200988");
+        OrderRequests.SaveRequest dropship = captor.getAllValues().get(1);
+        assertThat(dropship.fulfillmentType()).isEqualTo("ONE_CLICK_DROPSHIP");
+        assertThat(dropship.cargoes()).extracting(OrderRequests.Cargo::skuNo)
+            .containsExactly("SKU-S", "SKU-M", "SKU-L");
+        assertThat(dropship.cargoes()).extracting(OrderRequests.Cargo::packageCount).containsExactly(1, 1, 1);
+    }
+
+    private static byte[] workbook() throws Exception {
+        try (var workbook = new XSSFWorkbook(); var out = new ByteArrayOutputStream()) {
+            var sheet = workbook.createSheet("sheet1");
+            sheet.createRow(0).createCell(0).setCellValue("订单统计导出");
+            sheet.createRow(1).createCell(0).setCellValue("导出人:测试");
+            String[] headers = {"客户公司", "入仓码", "订单状态", "渠道", "品名/材质", "买单/退税", "目的仓", "邮编",
+                "货件编号", "FBA仓追踪编码", "SKU", "总箱数", "预报毛重", "预报体积", "货重比", "交货仓", "备注"};
+            var header = sheet.createRow(2);
+            for (int index = 0; index < headers.length; index++) header.createCell(index).setCellValue(headers[index]);
+            String[] fba = {"旧客户", "ZBYHK2609200988", "审核通过", "美森正班海卡包税", "玩偶-polyester-10件", "退税", "SCK4", "91730",
+                "FBA123-10件", "REF123", "", "10", "102", "0.986", "103.45", "义乌仓", ""};
+            String[] dropship = {"旧客户", "ZBYHK2609200983", "审核通过", "美森正班海卡包税", "内裤-polyester-3件", "买单", "洛杉矶仓一件代发", "91730",
+                "/-3件", "/", "SKU-S-1件\nSKU-M-1件\nSKU-L-1件", "3", "78", "0.360", "216.67", "义乌仓", ""};
+            write(sheet.createRow(3), fba);
+            write(sheet.createRow(4), dropship);
+            workbook.write(out);
+            return out.toByteArray();
+        }
+    }
+
+    private static void write(org.apache.poi.ss.usermodel.Row row, String[] values) {
+        for (int index = 0; index < values.length; index++) row.createCell(index).setCellValue(values[index]);
+    }
+}
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java b/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
index b6fddbb0e..0b1f3b1e5 100644
--- a/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
+++ b/warehouse/src/main/java/com/baiyue/warehouse/controller/InternalWarehouseController.java
@@ -57,6 +57,13 @@ public class InternalWarehouseController {
         return ApiResponse.success(service.activeDomesticWarehouses());
     }
 
+    @GetMapping("/order-catalog")
+    public ApiResponse<java.util.List<WarehouseApplicationService.WarehouseCatalogItem>> orderCatalog(
+            @RequestHeader(value="X-Internal-Service-Token", required=false) String token) {
+        verifyToken(token);
+        return ApiResponse.success(service.activeOrderCatalog());
+    }
+
     @GetMapping("/shared-overseas")
     public ApiResponse<List<SharedOverseasWarehouseResponse>> sharedOverseasWarehouses(
             @RequestHeader(value="X-Internal-Service-Token", required=false) String token) {
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/repository/WarehouseRepository.java b/warehouse/src/main/java/com/baiyue/warehouse/repository/WarehouseRepository.java
index 055df51b4..87ff92e64 100644
--- a/warehouse/src/main/java/com/baiyue/warehouse/repository/WarehouseRepository.java
+++ b/warehouse/src/main/java/com/baiyue/warehouse/repository/WarehouseRepository.java
@@ -68,6 +68,16 @@ public class WarehouseRepository {
             .orderByAsc(WarehouseEntity::getId));
     }
 
+    public List<WarehouseEntity> findAllActive(long tenantId) {
+        return warehouses.selectList(new LambdaQueryWrapper<WarehouseEntity>()
+            .eq(WarehouseEntity::getTenantId, tenantId)
+            .eq(WarehouseEntity::getStatus, "ACTIVE")
+            .in(WarehouseEntity::getWarehouseType, List.of("DOMESTIC", "FBA", "OVERSEAS"))
+            .orderByAsc(WarehouseEntity::getWarehouseType)
+            .orderByAsc(WarehouseEntity::getWarehouseName)
+            .orderByAsc(WarehouseEntity::getId));
+    }
+
     public boolean existsCode(long tenantId, String code, Long excludedId) {
         return warehouses.selectCount(new LambdaQueryWrapper<WarehouseEntity>()
             .eq(WarehouseEntity::getTenantId, tenantId)
diff --git a/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java b/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
index 0a3dd7d29..0ae0602ac 100644
--- a/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
+++ b/warehouse/src/main/java/com/baiyue/warehouse/service/WarehouseApplicationService.java
@@ -105,6 +105,16 @@ public class WarehouseApplicationService {
             .toList();
     }
 
+    public List<WarehouseCatalogItem> activeOrderCatalog() {
+        return repository.findAllActive(WarehouseSaveNormalizer.PUBLIC_TENANT_ID).stream()
+            .map(value -> new WarehouseCatalogItem(value.getId(), value.getWarehouseCode(),
+                value.getWarehouseName(), value.getWarehouseType(), value.getCountryCode()))
+            .toList();
+    }
+
+    public record WarehouseCatalogItem(Long id, String warehouseCode, String warehouseName,
+                                       String warehouseType, String countryCode) { }
+
     public List<SharedOverseasWarehouseResponse> activeSharedOverseasWarehouses() {
         return repository.findActiveByType(WarehouseSaveNormalizer.PUBLIC_TENANT_ID,
                 WarehouseSaveNormalizer.TYPE_OVERSEAS)
diff --git a/warehouse/src/main/resources/openapi/warehouse-v1.yaml b/warehouse/src/main/resources/openapi/warehouse-v1.yaml
new file mode 100644
index 000000000..909774b5e
--- /dev/null
+++ b/warehouse/src/main/resources/openapi/warehouse-v1.yaml
@@ -0,0 +1,19 @@
+openapi: 3.0.3
+info:
+  title: Warehouse internal order catalog
+  version: 1.0.0
+paths:
+  /internal/warehouses/order-catalog:
+    get:
+      summary: 查询订单可引用的启用公共仓库目录
+      description: 仅供订单服务解析旧系统导入文件；返回国内、FBA 和海外仓，不经公网网关暴露。
+      security:
+        - internalServiceToken: []
+      responses:
+        '200': {description: 返回仓库 ID、编码、名称、类型和国家编码}
+components:
+  securitySchemes:
+    internalServiceToken:
+      type: apiKey
+      in: header
+      name: X-Internal-Service-Token

From b3162c6d69fc62980f29e6609915fce1d583142c Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:26:03 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 file/AGENTS.md                                |  1 +
 .../file/service/PdaPackageStorage.java       |  3 +-
 .../resources/openapi/pda-releases-v1.yaml    | 77 +++++++++++++++++++
 scripts/gateway-route-contract.test.mjs       |  5 +-
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 file/src/main/resources/openapi/pda-releases-v1.yaml

diff --git a/file/AGENTS.md b/file/AGENTS.md
index 063fc77f7..7d16583d5 100644
--- a/file/AGENTS.md
+++ b/file/AGENTS.md
@@ -26,6 +26,7 @@
 | 派送单三类资料 | `src/main/resources/openapi/delivery-files-v1.yaml`；依次为装车照片 `DELIVERY_LOADING_PHOTO`、BOL文件（含签名）`DELIVERY_BOL`、签收文件（POD签收/快递签收）`DELIVERY_RECEIPT`，按客户、派送内部ID、类别隔离，任意格式单文件50MiB；Lastleg持有分类绑定、保存、替换删除和历史可见性，按非空类别计数x/3，不强制必传或识别签名；File保留不可变对象与真实createdAt |
 | 下游 OCR | `client/WeightOcrClient.java` |
 | SQL/配置 | `src/main/resources/db/file.sql`、`application.yml` |
+| 国内/海外 PDA 版本 | `controller/PdaReleaseController.java`、`service/PdaReleaseService.java`、`service/PdaPackageStorage.java`、`src/main/resources/openapi/pda-releases-v1.yaml`；平台上传草稿、发布和停发，匿名清单与包下载只暴露当前已发布/历史未停发文件；国内和海外 AppID、指针独立 |
 | 测试/验证 | `src/test/java/com/baiyue/file/`；`mvn -pl file -am test` |
 
 ## 修改约束
diff --git a/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java b/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
index 688664cc9..9f7f3df5f 100644
--- a/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
+++ b/file/src/main/java/com/baiyue/file/service/PdaPackageStorage.java
@@ -42,7 +42,8 @@ public class PdaPackageStorage {
             Files.createDirectories(target.getParent());
             file.transferTo(target);
             try (ZipFile zip = new ZipFile(target.toFile())) {
-                if (zip.size() == 0) throw new IOException("empty archive");
+                String required = type.equals("apk") ? "AndroidManifest.xml" : "manifest.json";
+                if (zip.getEntry(required) == null) throw new IOException("missing " + required);
             }
             return new Stored(key, Files.size(target), sha256(target));
         } catch (IOException | IllegalStateException exception) {
diff --git a/file/src/main/resources/openapi/pda-releases-v1.yaml b/file/src/main/resources/openapi/pda-releases-v1.yaml
new file mode 100644
index 000000000..eae49d46c
--- /dev/null
+++ b/file/src/main/resources/openapi/pda-releases-v1.yaml
@@ -0,0 +1,77 @@
+openapi: 3.0.3
+info:
+  title: PDA version releases
+  version: 1.0.0
+  description: Domestic and overseas PDA packages have independent AppIDs and publication pointers.
+paths:
+  /api/platform/v1/files/pda-releases/{app}:
+    parameters:
+      - $ref: '#/components/parameters/app'
+    get:
+      summary: List recent releases for one PDA application
+      security: [{ bearerAuth: [] }]
+      description: Requires platform:pda-release:list and PLATFORM membership.
+      responses:
+        '200': { description: ApiResponse containing release records and current flags }
+    post:
+      summary: Upload a draft APK or WGT (does not publish)
+      security: [{ bearerAuth: [] }]
+      description: Requires platform:pda-release:manage and PLATFORM membership. Maximum 200 MiB.
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              required: [packageType, versionName, versionCode, minAppVersionCode, file]
+              properties:
+                packageType: { type: string, enum: [apk, wgt] }
+                versionName: { type: string, example: 0.0.4 }
+                versionCode: { type: integer, minimum: 1 }
+                minAppVersionCode: { type: integer, minimum: 1 }
+                mandatory: { type: boolean }
+                releaseNotes: { type: string, maxLength: 1000 }
+                file: { type: string, format: binary }
+      responses:
+        '200': { description: ApiResponse containing a DRAFT release }
+  /api/platform/v1/files/pda-releases/{id}/publish:
+    post:
+      summary: Publish a draft and switch the current package pointer
+      security: [{ bearerAuth: [] }]
+      description: Requires platform:pda-release:manage and PLATFORM membership.
+      parameters: [{ $ref: '#/components/parameters/id' }]
+      responses:
+        '200': { description: ApiResponse containing the published release }
+  /api/platform/v1/files/pda-releases/{id}/withdraw:
+    post:
+      summary: Stop serving an active release
+      security: [{ bearerAuth: [] }]
+      description: Requires platform:pda-release:manage and PLATFORM membership.
+      parameters: [{ $ref: '#/components/parameters/id' }]
+      responses:
+        '200': { description: ApiResponse containing the withdrawn release }
+  /api/pda-updates/{app}/latest:
+    get:
+      summary: Anonymous update manifest for one PDA application
+      parameters:
+        - $ref: '#/components/parameters/app'
+        - { name: appid, in: query, required: true, schema: { type: string } }
+        - { name: platform, in: query, required: true, schema: { type: string, enum: [android] } }
+        - { name: appVersionCode, in: query, required: true, schema: { type: integer, minimum: 1 } }
+        - { name: wgtVersion, in: query, required: true, schema: { type: string } }
+      responses:
+        '200':
+          description: Plain JSON with update=false or an APK/WGT manifest including appid and minAppVersionCode.
+  /api/pda-updates/{app}/{id}/package:
+    get:
+      summary: Download a published package
+      parameters: [{ $ref: '#/components/parameters/app' }, { $ref: '#/components/parameters/id' }]
+      responses:
+        '200': { description: APK or WGT binary }
+        '404': { description: Draft or withdrawn package is not available }
+components:
+  securitySchemes:
+    bearerAuth: { type: http, scheme: bearer, bearerFormat: JWT }
+  parameters:
+    app: { name: app, in: path, required: true, schema: { type: string, enum: [domestic, overseas] } }
+    id: { name: id, in: path, required: true, schema: { type: string, format: uuid } }
diff --git a/scripts/gateway-route-contract.test.mjs b/scripts/gateway-route-contract.test.mjs
index 585001bfb..75b40ca37 100644
--- a/scripts/gateway-route-contract.test.mjs
+++ b/scripts/gateway-route-contract.test.mjs
@@ -105,7 +105,10 @@ test('Controller prefixes route to their owning service; internal prefixes stay
       ? [overseas] : ['file', 'print'].includes(module) ? [domestic, overseas] : [domestic]
     for (const file of javaFiles(resolve(root, module, 'src/main/java'))) {
       for (const path of controllerPaths(readFileSync(file, 'utf8'), file)) {
-        for (const table of tables) verify(path, service, table, file)
+        // PDA release metadata lives in the domestic File control plane. Both
+        // PDA apps use the domestic Gateway for update checks and downloads.
+        const targetTables = path.startsWith('/api/pda-updates/') ? [domestic] : tables
+        for (const table of targetTables) verify(path, service, table, file)
         count++
       }
     }

From b12e5c6ffaf2156c5767de59ca5073f8df4be1a0 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:26:49 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/service/PdaPackageStorageTest.java   | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java

diff --git a/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java b/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java
new file mode 100644
index 000000000..e0ca4e4f8
--- /dev/null
+++ b/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java
@@ -0,0 +1,52 @@
+package com.baiyue.file.service;
+
+import com.baiyue.common.core.exception.BizException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.springframework.mock.web.MockMultipartFile;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.file.Path;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class PdaPackageStorageTest {
+    @TempDir Path root;
+
+    @Test
+    void rejectsWrongContentAndExtension() {
+        var storage = new PdaPackageStorage(root.toString());
+        var invalid = new MockMultipartFile("file", "app.wgt", "application/octet-stream", new byte[] {1, 2, 3});
+        assertThatThrownBy(() -> storage.store("domestic", "11111111-1111-1111-1111-111111111111", "wgt", invalid))
+            .isInstanceOf(BizException.class);
+        var wrongName = new MockMultipartFile("file", "app.apk", "application/octet-stream", archive("manifest.json"));
+        assertThatThrownBy(() -> storage.store("domestic", "11111111-1111-1111-1111-111111111111", "wgt", wrongName))
+            .isInstanceOf(BizException.class);
+    }
+
+    @Test
+    void validatesPackageStructureAndReadsStoredContent() throws Exception {
+        var storage = new PdaPackageStorage(root.toString());
+        byte[] content = archive("manifest.json");
+        var file = new MockMultipartFile("file", "app.wgt", "application/octet-stream", content);
+        var stored = storage.store("overseas", "22222222-2222-2222-2222-222222222222", "wgt", file);
+        assertThat(stored.key()).isEqualTo("overseas/22222222-2222-2222-2222-222222222222.wgt");
+        assertThat(stored.sha256()).hasSize(64);
+        assertThat(storage.load(stored.key()).getContentAsByteArray()).isEqualTo(content);
+        assertThatThrownBy(() -> storage.load("../domestic/22222222-2222-2222-2222-222222222222.wgt"))
+            .isInstanceOf(BizException.class);
+    }
+
+    private static byte[] archive(String entryName) throws Exception {
+        var output = new ByteArrayOutputStream();
+        try (var zip = new ZipOutputStream(output)) {
+            zip.putNextEntry(new ZipEntry(entryName));
+            zip.write("{}".getBytes(java.nio.charset.StandardCharsets.UTF_8));
+            zip.closeEntry();
+        }
+        return output.toByteArray();
+    }
+}

From 784f7ea6cd71c807c2d7f7ac88029fe047f9643a Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:28:25 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/service/PdaReleaseServiceTest.java   | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java

diff --git a/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java b/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java
new file mode 100644
index 000000000..146db4720
--- /dev/null
+++ b/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java
@@ -0,0 +1,82 @@
+package com.baiyue.file.service;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class PdaReleaseServiceTest {
+    private static final String APK = "11111111-1111-1111-1111-111111111111";
+    private static final String WGT = "22222222-2222-2222-2222-222222222222";
+
+    @Test
+    void selectsApkForOldBaseThenWgtForCompatibleBase() throws Exception {
+        var jdbc = mock(JdbcTemplate.class);
+        stubQueries(jdbc);
+        var service = new PdaReleaseService(jdbc, mock(PdaPackageStorage.class),
+            "https://updates.example.com", "domestic-app", "overseas-app");
+
+        assertThat(service.latest("domestic", "domestic-app", "android", 1, "1.0.0"))
+            .containsEntry("packageType", "apk").containsEntry("appid", "domestic-app");
+        assertThat(service.latest("domestic", "domestic-app", "android", 2, "1.0.0"))
+            .containsEntry("packageType", "wgt").containsEntry("minAppVersionCode", 2);
+        assertThat(service.latest("domestic", "domestic-app", "android", 2, "1.0.10"))
+            .isEqualTo(Map.of("update", false));
+        assertThatThrownBy(() -> service.latest("domestic", "overseas-app", "android", 2, "1.0.0"))
+            .hasMessageContaining("参数无效");
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    private static void stubQueries(JdbcTemplate jdbc) throws Exception {
+        when(jdbc.query(anyString(), any(RowMapper.class), any(Object[].class))).thenAnswer(invocation -> {
+            String sql = invocation.getArgument(0);
+            RowMapper mapper = invocation.getArgument(1);
+            Object[] params = invocation.getArgument(2);
+            if (sql.contains("file_pda_release_channel")) {
+                ResultSet rs = mock(ResultSet.class);
+                when(rs.getString(1)).thenReturn("domestic-app");
+                when(rs.getString(2)).thenReturn(APK);
+                when(rs.getString(3)).thenReturn(WGT);
+                return List.of(mapper.mapRow(rs, 0));
+            }
+            if (sql.contains("file_pda_release") && params.length == 1) {
+                String id = (String) params[0];
+                ResultSet rs = releaseRow(id);
+                return List.of(mapper.mapRow(rs, 0));
+            }
+            return List.of();
+        });
+    }
+
+    private static ResultSet releaseRow(String id) throws Exception {
+        ResultSet rs = mock(ResultSet.class);
+        boolean apk = id.equals(APK);
+        when(rs.getString("id")).thenReturn(id);
+        when(rs.getString("app_code")).thenReturn("domestic");
+        when(rs.getString("app_id")).thenReturn("domestic-app");
+        when(rs.getString("package_type")).thenReturn(apk ? "apk" : "wgt");
+        when(rs.getString("version_name")).thenReturn(apk ? "1.0.0" : "1.0.10");
+        when(rs.getInt("version_code")).thenReturn(2);
+        when(rs.getInt("min_app_version_code")).thenReturn(2);
+        when(rs.getString("release_notes")).thenReturn("Update");
+        when(rs.getString("status")).thenReturn("PUBLISHED");
+        when(rs.getString("object_key")).thenReturn("domestic/" + id + (apk ? ".apk" : ".wgt"));
+        when(rs.getString("sha256")).thenReturn("a".repeat(64));
+        when(rs.getLong("size_bytes")).thenReturn(256L);
+        when(rs.getTimestamp("created_at")).thenReturn(Timestamp.valueOf(LocalDateTime.of(2026, 9, 20, 1, 0)));
+        when(rs.getTimestamp("published_at")).thenReturn(Timestamp.valueOf(LocalDateTime.of(2026, 9, 20, 2, 0)));
+        return rs;
+    }
+}

From 99b1156f9697e626f5af07cd6e668106bc0bef1e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:34:02 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/baiyue/file/service/PdaPackageStorageTest.java  | 2 +-
 .../java/com/baiyue/file/service/PdaReleaseServiceTest.java  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java b/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java
index e0ca4e4f8..0fe199bba 100644
--- a/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java
+++ b/file/src/test/java/com/baiyue/file/service/PdaPackageStorageTest.java
@@ -17,7 +17,7 @@ class PdaPackageStorageTest {
     @TempDir Path root;
 
     @Test
-    void rejectsWrongContentAndExtension() {
+    void rejectsWrongContentAndExtension() throws Exception {
         var storage = new PdaPackageStorage(root.toString());
         var invalid = new MockMultipartFile("file", "app.wgt", "application/octet-stream", new byte[] {1, 2, 3});
         assertThatThrownBy(() -> storage.store("domestic", "11111111-1111-1111-1111-111111111111", "wgt", invalid))
diff --git a/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java b/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java
index 146db4720..4d80e021c 100644
--- a/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java
+++ b/file/src/test/java/com/baiyue/file/service/PdaReleaseServiceTest.java
@@ -43,7 +43,6 @@ class PdaReleaseServiceTest {
         when(jdbc.query(anyString(), any(RowMapper.class), any(Object[].class))).thenAnswer(invocation -> {
             String sql = invocation.getArgument(0);
             RowMapper mapper = invocation.getArgument(1);
-            Object[] params = invocation.getArgument(2);
             if (sql.contains("file_pda_release_channel")) {
                 ResultSet rs = mock(ResultSet.class);
                 when(rs.getString(1)).thenReturn("domestic-app");
@@ -51,8 +50,8 @@ class PdaReleaseServiceTest {
                 when(rs.getString(3)).thenReturn(WGT);
                 return List.of(mapper.mapRow(rs, 0));
             }
-            if (sql.contains("file_pda_release") && params.length == 1) {
-                String id = (String) params[0];
+            if (sql.contains("file_pda_release")) {
+                String id = invocation.getArgument(2);
                 ResultSet rs = releaseRow(id);
                 return List.of(mapper.mapRow(rs, 0));
             }

From 398f4e698316c470ac915ac1d7e4662c24b5799c Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:36:22 +0800
Subject: [PATCH 08/26] test: align database initialization contracts

---
 .../iam/repository/CustomerProfileMigrationContractTest.java | 4 +++-
 .../repository/Phase5DeliveryPermissionSqlContractTest.java  | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
index b957d375f..da60efa9a 100644
--- a/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/repository/CustomerProfileMigrationContractTest.java
@@ -73,7 +73,9 @@ class CustomerProfileMigrationContractTest {
                 .contains("SELECT 'PASS' AS initialization_status")
                 .doesNotContain("ALTER TABLE iam_tenant", "phase1_iam_add_column");
         assertThat(instructions)
-                .contains("当前开发阶段只维护纯初始化")
+                .contains("两个统一 SQL 文件仍只用于空库初始化")
+                .contains("已有生产库的受控结构补齐单独放在 `migrations/`")
+                .contains("不提供存量数据回填、清理或兼容入口")
                 .contains("模块 `src/main/resources/db/` 用作结构来源和开发追溯")
                 .contains("不再向历史迁移文件追加发布步骤");
     }
diff --git a/iam/src/test/java/com/baiyue/iam/repository/Phase5DeliveryPermissionSqlContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/Phase5DeliveryPermissionSqlContractTest.java
index a1ebb90c5..ee5ac806d 100644
--- a/iam/src/test/java/com/baiyue/iam/repository/Phase5DeliveryPermissionSqlContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/repository/Phase5DeliveryPermissionSqlContractTest.java
@@ -160,8 +160,9 @@ class Phase5DeliveryPermissionSqlContractTest {
         String readme = repositoryFile("deploy/sql/README.md");
 
         assertThat(readme).contains(
-            "当前开发阶段只维护纯初始化",
-            "两个 SQL 文件沿用原文件名",
+            "两个统一 SQL 文件仍只用于空库初始化",
+            "已有生产库的受控结构补齐单独放在 `migrations/`",
+            "不提供存量数据回填、清理或兼容入口",
             "国内 IAM 是全部平台与客户权限的唯一权威",
             "模块 `src/main/resources/db/` 用作结构来源和开发追溯",
             "不再向历史迁移文件追加发布步骤");

From a7d458cdddbfe1353f0bdef6ce1e66c3b8f93c68 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 14:43:26 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                                   |  19 +++
 firstleg/AGENTS.md                            |   2 +-
 .../coload/persistence/ColoadGroupMapper.java |   9 +
 .../persistence/ColoadPersistenceRows.java    |   3 +
 .../coload/service/ColoadGroupService.java    |  45 ++++-
 .../resources/openapi/coload-groups-v1.yaml   |  11 +-
 .../ColoadGroupOpenApiContractTest.java       |  15 +-
 .../coload/ColoadGroupServiceTest.java        | 112 ++++++++++++-
 scripts/README.md                             |   1 +
 scripts/agents-index-contract.ps1             |   4 +-
 scripts/database-schema-contract.mjs          | 158 ++++++++++++++++++
 11 files changed, 356 insertions(+), 23 deletions(-)
 create mode 100644 scripts/database-schema-contract.mjs

diff --git a/Jenkinsfile b/Jenkinsfile
index 5a1264f5c..f3ec9511c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -369,6 +369,25 @@ pipeline {
             }
         }
 
+        stage('数据库结构只读门禁') {
+            agent { label 'java-builder' }
+            steps {
+                script {
+                    String credentialId = "firstleg-${env.RESOLVED_ENVIRONMENT}-schema-readonly"
+                    withCredentials([file(credentialsId: credentialId, variable: 'SCHEMA_CHECK_ENV_FILE')]) {
+                        sh '''
+                            set -eu
+                            set -a
+                            . "$SCHEMA_CHECK_ENV_FILE"
+                            set +a
+                            test "${SCHEMA_CHECK_READ_ONLY:-}" = "true"
+                            node scripts/database-schema-contract.mjs --region BOTH
+                        '''
+                    }
+                }
+            }
+        }
+
         stage('统一 Maven 测试门禁') {
             when {
                 expression { env.NO_SERVICE_CHANGE != 'true' && !params.SKIP_TESTS }
diff --git a/firstleg/AGENTS.md b/firstleg/AGENTS.md
index 32fffe3f1..8d8cf8596 100644
--- a/firstleg/AGENTS.md
+++ b/firstleg/AGENTS.md
@@ -37,7 +37,7 @@
 | 柜次费用明细与跨客户分摊组 | `controller/PlatformContainerFeeDetailController.java`、`service/ContainerFeeDetailService.java`、`dto/ContainerFeeDetailDtos.java`；跨客户公共柜费使用 `allocation-groups` 按柜内真实客户和订单原子分摊，入仓 ID/入仓码同时填写或同时留空；各行金额合计必须等于原始柜费，审核、驳回、调整、作废均整组处理，单行入口拒绝分摊组；契约 `src/main/resources/openapi/container-fees-v1.yaml`；Admin 消费端见 `../../apps/admin-web/src/modules/loading-lists/api/containerFees.ts` |
 | 财务整柜成本分摊快照 | `loading/controller/InternalFinanceCostSnapshotController.java`、`loading/service/FinanceCostSnapshotService.java` |
 | 分柜、预装、真实柜号后补与正式装柜清单生命周期 | `split/controller/PlatformSplitPreloadController.java`、`controller/PlatformLoadingListController.java`、`service/LoadingListService.java`；契约 `src/main/resources/openapi/loading-lists-v1.yaml`，详情阶段先查 `/loading-plans/{planId}/lifecycle`。创建柜次时原子生成唯一预装计划，加入入仓码明细时同步创建入库预装聚合与关联，不设推送步骤；同一 `planId` 在 `EDITING/LOADING` 返回 `PRELOAD`，`COMPLETED` 返回 `LOADING_LIST`。订单协作备注以 Order 为权威，`OrderRemarksSyncService` 负责订单列表与全部未冻结预装明细双向同步，完成装柜后保留冻结快照。订舱关联、预装确认和 PDA task 创建不依赖真实集装箱号；可在 `EDITING/LOADING` 首次补录，最终 PDA 完成前必须存在；已有值纠正仅限 `EDITING` 且任务未领取、无物理作业事实 |
-| 同柜不可拆组 | `loading/coload/controller/PlatformColoadGroupController.java`、`service/ColoadGroupService.java`、`persistence/ColoadGroupMapper.java`；契约 `src/main/resources/openapi/coload-groups-v1.yaml`。请求按订单 ID 建组，服务端冻结每票全部 `WAIT_SPLIT` 可用入仓片段与满箱数；仅要求同国内仓、同渠道，允许跨客户及不同目的仓港；分配、移除、取消均保持整组原子 |
+| 同柜不可拆组 | `loading/coload/controller/PlatformColoadGroupController.java`、`service/ColoadGroupService.java`、`persistence/ColoadGroupMapper.java`；契约 `src/main/resources/openapi/coload-groups-v1.yaml`。请求按订单 ID 建组，服务端允许待审核、待测量/测量中、待分柜及装柜中订单，冻结每票全部有效入仓片段与满箱数；成员全部未进柜时创建未锁定组，成员已满箱进入同一装柜计划时直接创建锁定组，部分占用或跨柜时拒绝；仅要求同国内仓、同渠道，允许跨客户及不同目的仓港；分配、移除、取消均保持整组原子 |
 | 货柜与全局智能排柜 | `controller/PlatformContainerController.java`、`PlatformSmartLoadingController.java`、`service/SmartLoadingService.java`、`repository/SmartLoadingRepository.java`、`client/PendingReviewOrderClient.java`、`loading/`；全局候选合并本服务履约投影与 Order `/internal/order/v1/pending-review-orders` 权威待审核页，工作台柜次从 `/inbound-candidates`、`/containers` 进入；普通箱数、待审核占位、同柜组和全部未拣移除分别走 `/inbound-assignments`、`/pending-review-assignments`、`/group-assignments`、`/unpicked-items`，明细规格拆分留在服务端 |
 | 货柜资料、PDA 证据与业务总览 | `controller/PlatformContainerController.java` 的 `/{id}/overview`、`/{id}/documents/{documentType}`，聚合 `mapper/ContainerOverviewMapper.java`；契约 `src/main/resources/openapi/phase3-container-overview-v1.yaml`，四类资料固定为目的港清关、国内出口报关、DO、PU 的当前唯一版本 |
 | PDA 拣货与装柜、证据幂等上传 | `controller/PlatformLoadingPdaController.java`、`loading/controller/PlatformLoadingDeliveryController.java`、`loading/service/CabinetLoadingEvidenceService.java`；证据写入和 multipart 上传均先以任务内幂等键匹配请求哈希，上传哈希覆盖仓库、版本、证据类型、锁码、备注、文件名、媒体类型、大小与文件内容；完全重放返回当前视图且不得再次上传 File，相同键不同内容返回冲突 |
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
index 6bc428f35..eef7d4cfb 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
@@ -22,6 +22,15 @@ public interface ColoadGroupMapper {
                (SELECT COUNT(*) FROM fl_loading_plan_item item
                  WHERE item.account_id=o.tenant_id AND item.inbound_id=o.id AND item.deleted=0)
                  activeAllocationCount,
+               (SELECT COUNT(DISTINCT item.loading_plan_id) FROM fl_loading_plan_item item
+                 WHERE item.account_id=o.tenant_id AND item.inbound_id=o.id AND item.deleted=0)
+                 activeAllocationPlanCount,
+               (SELECT MIN(item.loading_plan_id) FROM fl_loading_plan_item item
+                 WHERE item.account_id=o.tenant_id AND item.inbound_id=o.id AND item.deleted=0)
+                 activeAllocationPlanId,
+               (SELECT COALESCE(SUM(item.package_count),0) FROM fl_loading_plan_item item
+                 WHERE item.account_id=o.tenant_id AND item.inbound_id=o.id AND item.deleted=0)
+                 activeAllocatedPackageCount,
                (SELECT member.group_id FROM fl_coload_group_member member
                  WHERE member.tenant_id=o.tenant_id AND member.inbound_id=o.id
                    AND member.active_flag=1 LIMIT 1) activeGroupId
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadPersistenceRows.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadPersistenceRows.java
index 4ea52edc5..6ee1eca41 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadPersistenceRows.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadPersistenceRows.java
@@ -25,6 +25,9 @@ public final class ColoadPersistenceRows {
         private String channelName;
         private Integer fullPackageCount;
         private Integer activeAllocationCount;
+        private Integer activeAllocationPlanCount;
+        private Long activeAllocationPlanId;
+        private Integer activeAllocatedPackageCount;
         private Long activeGroupId;
     }
 
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
index 369717a2c..dfa38d9cf 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
@@ -35,6 +35,9 @@ import java.util.Set;
 @Service
 public class ColoadGroupService implements ColoadGroupAssignmentPort {
     private static final Set<String> CURRENT_GROUP_STATUSES = Set.of("ACTIVE", "LOCKED", "CONSUMED");
+    private static final Set<String> PRE_LOADING_GROUP_STATUSES = Set.of(
+        "PREPARING", "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED",
+        "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "WAIT_SPLIT");
 
     @Resource
     private ColoadGroupMapper mapper;
@@ -50,6 +53,7 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
 
         List<InboundCandidateRow> candidates = authoritativeCandidates(orderIds, null);
         validateSameRoute(candidates);
+        Long lockedPlanId = validateAllocationState(candidates);
         long groupId = IdWorker.getId();
         String groupNo = "CLG-" + groupId;
         InboundCandidateRow first = candidates.get(0);
@@ -60,6 +64,14 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
                 candidate.getInboundId(), candidate.getFullPackageCount());
         }
         history(groupId, "CREATE", null, "ACTIVE", null, key, null, operatorId, operatorName);
+        if (lockedPlanId != null) {
+            if (mapper.lockToPlan(groupId, lockedPlanId, operatorId, trim(operatorName)) != 1) {
+                throw conflict("装柜中订单的同柜组锁定失败，请刷新后重试");
+            }
+            history(groupId, "LOCK", "ACTIVE", "LOCKED", lockedPlanId,
+                "CREATE-LOCK-" + sha256(key).substring(0, 48), null,
+                operatorId, operatorName);
+        }
         complete(claim.commandId(), groupId);
         return requiredSnapshot(groupId);
     }
@@ -257,8 +269,10 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
         if (row.getTenantId() == null || row.getTenantId() <= 0
             || row.getInboundId() == null || row.getInboundId() <= 0
             || !StringUtils.hasText(row.getInboundCode())) return "权威业务快照缺失";
-        if (!"WAIT_SPLIT".equals(row.getProcessStatus())) return "状态非待分柜";
-        if (!Objects.equals(row.getActiveAllocationCount(), 0)) return "已分配装柜计划";
+        if (!PRE_LOADING_GROUP_STATUSES.contains(row.getProcessStatus())
+            && !"LOADING".equals(row.getProcessStatus())) {
+            return "状态不允许创建同柜组";
+        }
         if (row.getActiveGroupId() != null && !Objects.equals(row.getActiveGroupId(), allowedGroupId)) {
             return "已在其他同柜组";
         }
@@ -271,6 +285,33 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
         return null;
     }
 
+    private Long validateAllocationState(List<InboundCandidateRow> rows) {
+        boolean hasAllocation = rows.stream().anyMatch(row -> !Objects.equals(row.getActiveAllocationCount(), 0));
+        boolean hasUnallocated = rows.stream().anyMatch(row -> Objects.equals(row.getActiveAllocationCount(), 0));
+        if (!hasAllocation) {
+            if (rows.stream().anyMatch(row -> "LOADING".equals(row.getProcessStatus()))) {
+                throw conflict("装柜中订单缺少有效装柜计划占用");
+            }
+            return null;
+        }
+        if (hasUnallocated) {
+            throw conflict("所选订单只有部分成员进入装柜计划，不能创建同柜组");
+        }
+        Long planId = null;
+        for (InboundCandidateRow row : rows) {
+            if (!Objects.equals(row.getActiveAllocationPlanCount(), 1)
+                || row.getActiveAllocationPlanId() == null
+                || !Objects.equals(row.getActiveAllocatedPackageCount(), row.getFullPackageCount())) {
+                throw conflict(candidateLabel(row) + "未完整分配到唯一装柜计划");
+            }
+            if (planId == null) planId = row.getActiveAllocationPlanId();
+            else if (!Objects.equals(planId, row.getActiveAllocationPlanId())) {
+                throw conflict("所选装柜中订单不在同一个装柜计划，不能创建同柜组");
+            }
+        }
+        return planId;
+    }
+
     private static String candidateLabel(InboundCandidateRow row) {
         return StringUtils.hasText(row.getInboundCode())
             ? "入仓码“" + row.getInboundCode().trim() + "”" : "入仓码缺失的片段";
diff --git a/firstleg/src/main/resources/openapi/coload-groups-v1.yaml b/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
index 577859844..abe56c392 100644
--- a/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
+++ b/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
@@ -8,11 +8,12 @@ paths:
     post:
       summary: 创建同柜不可拆组
       description: >-
-        需要 platform:firstleg:smart-loading:assign。orderIds 至少2项；服务端解析每个订单全部 WAIT_SPLIT、
-        未分配且未属于其他活动组的可用入库片段，要求国内仓和渠道一致，并冻结全部片段及其满箱数。
-        同一订单部分片段不可用时只纳入全部当前可用片段；全部不可用时按入仓码明确返回状态非待分柜、
-        已分配装柜计划、已在其他同柜组、箱数无效或仓库/渠道权威快照缺失。跨成员仓库或渠道不一致时
-        返回入仓码及仓库名/渠道名；平台错误不得展示 orderId、inboundId 或 groupId。
+        需要 platform:firstleg:smart-loading:assign。orderIds 至少2项；服务端解析每个订单处于待审核、
+        待测量/测量中、待分柜或装柜中的全部有效入仓片段，要求国内仓和渠道一致，并冻结全部片段及其满箱数。
+        全部成员未进入装柜计划时创建 ACTIVE 组；全部成员已经按满箱数完整进入同一个装柜计划时直接创建并
+        锁定为 LOCKED 组。仅部分成员进柜、分散在不同装柜计划、箱数不完整、已属于其他活动组或权威仓库/
+        渠道快照缺失时拒绝。跨成员仓库或渠道不一致时返回入仓码及仓库名/渠道名；平台错误不得展示
+        orderId、inboundId 或 groupId。
       parameters:
         - $ref: '#/components/parameters/IdempotencyKey'
       requestBody:
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupOpenApiContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupOpenApiContractTest.java
index 5b74f9424..67c3004be 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupOpenApiContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupOpenApiContractTest.java
@@ -39,12 +39,17 @@ class ColoadGroupOpenApiContractTest {
             .contains("platform:firstleg:smart-loading:assign")
             .contains("platform:firstleg:smart-loading:list")
             .contains("任一冻结成员缺少有效 inboundCode 时失败关闭")
-            .contains("全部 WAIT_SPLIT")
+            .contains("待审核")
+            .contains("待测量/测量中")
+            .contains("待分柜或装柜中")
+            .contains("直接创建并")
+            .contains("锁定为 LOCKED 组")
             .contains("国内仓和渠道一致")
-            .contains("状态非待分柜")
-            .contains("已分配装柜计划")
-            .contains("已在其他同柜组")
-            .contains("平台错误不得展示 orderId、inboundId 或 groupId")
+            .contains("仅部分成员进柜")
+            .contains("分散在不同装柜计划")
+            .contains("已属于其他活动组")
+            .contains("平台错误不得展示")
+            .contains("orderId、inboundId 或 groupId")
             .doesNotContain("destinationType")
             .doesNotContain("destinationWarehouseId")
             .doesNotContain("destinationCode")
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
index 07e46b5f3..587578fcc 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
@@ -123,11 +123,9 @@ class ColoadGroupServiceTest {
 
     @Test
     void createsCrossCustomerGroupAndFreezesAllAvailableFragmentsForEveryOrder() {
-        InboundCandidateRow alreadyAllocatedFragment = candidate(101L, 11L, 1004L, 40);
-        alreadyAllocatedFragment.setActiveAllocationCount(1);
         when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(List.of(
             candidate(101L, 11L, 1001L, 30), candidate(101L, 11L, 1003L, 20),
-            alreadyAllocatedFragment, candidate(202L, 12L, 1002L, 50)));
+            candidate(202L, 12L, 1002L, 50)));
         when(mapper.insertGroup(anyLong(), anyString(), eq(9L), eq("CH"),
             eq(7L), eq("operator"))).thenReturn(1);
         when(mapper.insertMember(anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyInt()))
@@ -154,8 +152,82 @@ class ColoadGroupServiceTest {
         verify(mapper).insertMember(anyLong(), eq(groupId.getValue()), eq(101L), eq(11L), eq(1001L), eq(30));
         verify(mapper).insertMember(anyLong(), eq(groupId.getValue()), eq(101L), eq(11L), eq(1003L), eq(20));
         verify(mapper).insertMember(anyLong(), eq(groupId.getValue()), eq(202L), eq(12L), eq(1002L), eq(50));
-        verify(mapper, never()).insertMember(anyLong(), eq(groupId.getValue()), eq(101L), eq(11L),
-            eq(1004L), anyInt());
+    }
+
+    @org.junit.jupiter.params.ParameterizedTest
+    @org.junit.jupiter.params.provider.ValueSource(strings = {
+        "PREPARING", "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED",
+        "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "WAIT_SPLIT"
+    })
+    void createsUnlockedGroupBeforeLoading(String status) {
+        InboundCandidateRow first = candidate(101L, 11L, 1001L, 30); first.setProcessStatus(status);
+        InboundCandidateRow second = candidate(202L, 12L, 1002L, 50); second.setProcessStatus(status);
+        stubSuccessfulCreate("status-" + status, List.of(first, second), "ACTIVE", null);
+
+        var result = service.create(List.of(11L, 12L), "status-" + status, 7L, "operator");
+
+        assertThat(result.status()).isEqualTo("ACTIVE");
+        verify(mapper, never()).lockToPlan(anyLong(), anyLong(), anyLong(), any());
+    }
+
+    @Test
+    void createsLockedGroupWhenEveryLoadingMemberIsFullyAllocatedToTheSamePlan() {
+        InboundCandidateRow first = loadingCandidate(101L, 11L, 1001L, 30, 700L);
+        InboundCandidateRow second = loadingCandidate(202L, 12L, 1002L, 50, 700L);
+        stubSuccessfulCreate("loading-key", List.of(first, second), "LOCKED", 700L);
+        when(mapper.lockToPlan(anyLong(), eq(700L), eq(7L), eq("operator"))).thenReturn(1);
+
+        var result = service.create(List.of(11L, 12L), "loading-key", 7L, "operator");
+
+        assertThat(result.status()).isEqualTo("LOCKED");
+        assertThat(result.lockedPlanId()).isEqualTo(700L);
+        verify(mapper).lockToPlan(anyLong(), eq(700L), eq(7L), eq("operator"));
+        verify(mapper).insertHistory(anyLong(), anyLong(), eq("LOCK"), eq("ACTIVE"), eq("LOCKED"),
+            eq(700L), anyString(), isNull(), eq(7L), eq("operator"));
+    }
+
+    @Test
+    void createsLockedGroupForPreMeasurementOrdersAlreadyFullyReservedInTheSamePlan() {
+        InboundCandidateRow first = loadingCandidate(101L, 11L, 1001L, 30, 700L);
+        first.setProcessStatus("PREPARING");
+        InboundCandidateRow second = loadingCandidate(202L, 12L, 1002L, 50, 700L);
+        second.setProcessStatus("MEASURING");
+        stubSuccessfulCreate("reserved-early", List.of(first, second), "LOCKED", 700L);
+        when(mapper.lockToPlan(anyLong(), eq(700L), eq(7L), eq("operator"))).thenReturn(1);
+
+        var result = service.create(List.of(11L, 12L), "reserved-early", 7L, "operator");
+
+        assertThat(result.status()).isEqualTo("LOCKED");
+        assertThat(result.lockedPlanId()).isEqualTo(700L);
+    }
+
+    @Test
+    void rejectsLoadingMembersSplitAcrossPlansOrNotFullyAllocated() {
+        when(mapper.insertCommand(anyLong(), eq(7L), eq("CREATE"), anyString(), anyString())).thenReturn(1);
+        InboundCandidateRow first = loadingCandidate(101L, 11L, 1001L, 30, 700L);
+        InboundCandidateRow otherPlan = loadingCandidate(202L, 12L, 1002L, 50, 701L);
+        when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(List.of(first, otherPlan));
+        assertThatThrownBy(() -> service.create(List.of(11L, 12L), "different-plans", 7L, "operator"))
+            .isInstanceOf(BizException.class).hasMessageContaining("不在同一个装柜计划");
+
+        InboundCandidateRow partial = loadingCandidate(202L, 12L, 1002L, 50, 700L);
+        partial.setActiveAllocatedPackageCount(49);
+        when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(List.of(first, partial));
+        assertThatThrownBy(() -> service.create(List.of(11L, 12L), "partial-loading", 7L, "operator"))
+            .isInstanceOf(BizException.class).hasMessageContaining("未完整分配到唯一装柜计划");
+    }
+
+    @Test
+    void rejectsSelectionWhenOnlyPartOfTheMembersHasEnteredAPlan() {
+        when(mapper.insertCommand(anyLong(), eq(7L), eq("CREATE"), anyString(), anyString())).thenReturn(1);
+        InboundCandidateRow reserved = loadingCandidate(101L, 11L, 1001L, 30, 700L);
+        reserved.setProcessStatus("WAIT_MEASURE");
+        InboundCandidateRow unallocated = candidate(202L, 12L, 1002L, 50);
+        unallocated.setProcessStatus("MEASURING");
+        when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(List.of(reserved, unallocated));
+
+        assertThatThrownBy(() -> service.create(List.of(11L, 12L), "partly-reserved", 7L, "operator"))
+            .isInstanceOf(BizException.class).hasMessageContaining("只有部分成员进入装柜计划");
     }
 
     @Test
@@ -179,7 +251,7 @@ class ColoadGroupServiceTest {
         assertThatThrownBy(() -> service.create(List.of(11L, 12L), "key", 7L, "operator"))
             .isInstanceOf(BizException.class)
             .hasMessageContaining("订单“FO-11”")
-            .hasMessageContaining("入仓码“IN-1001”已分配装柜计划")
+            .hasMessageContaining("入仓码“IN-1001”已在其他同柜组")
             .hasMessageNotContaining("订单 11")
             .hasMessageNotContaining("groupId")
             .hasMessageNotContaining("inboundId");
@@ -219,8 +291,8 @@ class ColoadGroupServiceTest {
         when(mapper.insertCommand(anyLong(), eq(7L), eq("CREATE"), anyString(), anyString()))
             .thenReturn(1);
         InboundCandidateRow status = candidate(101L, 11L, 1001L, 30);
-        status.setProcessStatus("LOADING");
-        assertUnavailable(status, "state-key", "状态非待分柜");
+        status.setProcessStatus("LOADED");
+        assertUnavailable(status, "state-key", "状态不允许创建同柜组");
 
         InboundCandidateRow grouped = candidate(101L, 11L, 1001L, 30);
         grouped.setActiveGroupId(900L);
@@ -393,9 +465,33 @@ class ColoadGroupServiceTest {
         value.setProcessStatus("WAIT_SPLIT"); value.setWarehouseId(9L); value.setWarehouseName("义乌仓");
         value.setChannelCode("CH"); value.setChannelName("美森海卡");
         value.setFullPackageCount(packages); value.setActiveAllocationCount(0);
+        value.setActiveAllocationPlanCount(0); value.setActiveAllocatedPackageCount(0);
         return value;
     }
 
+    private static InboundCandidateRow loadingCandidate(long tenantId, long orderId, long inboundId,
+                                                        int packages, long planId) {
+        InboundCandidateRow value = candidate(tenantId, orderId, inboundId, packages);
+        value.setProcessStatus("LOADING"); value.setActiveAllocationCount(1);
+        value.setActiveAllocationPlanCount(1); value.setActiveAllocationPlanId(planId);
+        value.setActiveAllocatedPackageCount(packages);
+        return value;
+    }
+
+    private void stubSuccessfulCreate(String key, List<InboundCandidateRow> candidates,
+                                      String resultStatus, Long planId) {
+        when(mapper.insertCommand(anyLong(), eq(7L), eq("CREATE"), eq(key), anyString())).thenReturn(1);
+        when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(candidates);
+        when(mapper.insertGroup(anyLong(), anyString(), eq(9L), eq("CH"), eq(7L), eq("operator"))).thenReturn(1);
+        when(mapper.insertMember(anyLong(), anyLong(), anyLong(), anyLong(), anyLong(), anyInt())).thenReturn(1);
+        when(mapper.insertHistory(anyLong(), anyLong(), anyString(), any(), anyString(), any(),
+            anyString(), any(), anyLong(), any())).thenReturn(1);
+        when(mapper.completeCommand(anyLong(), anyLong())).thenReturn(1);
+        when(mapper.group(anyLong())).thenReturn(group(500L, resultStatus, planId, "LOCKED".equals(resultStatus) ? 1 : 0));
+        when(mapper.members(anyLong())).thenReturn(candidates.stream().map(row -> member(
+            row.getTenantId(), row.getOrderId(), row.getInboundId(), row.getFullPackageCount())).toList());
+    }
+
     private void assertUnavailable(InboundCandidateRow row, String key, String reason) {
         when(mapper.lockCandidates(List.of(11L, 12L))).thenReturn(List.of(
             row, candidate(202L, 12L, 1002L, 50)));
diff --git a/scripts/README.md b/scripts/README.md
index e3e641057..e0ec274ad 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -126,6 +126,7 @@ Client 全量、Client 入库测量与计费、待审核订单和批量待分柜
 | 本地质量 | `backend-full-regression.ps1` | Mapper 门禁后执行受影响后端 Maven 测试；`-DryRun` 只打印与校验 |
 | 本地质量 | `frontend-full-regression.ps1` | 编排 Admin/Client 本地测试、类型检查及国内/海外 PDA Node 全量测试，不访问 Gateway |
 | 本地质量 | `database-comment-audit.ps1` | 离线扫描数据库中文注释，不连接数据库 |
+| Jenkins 只读数据库结构 | `database-schema-contract.mjs` | 只查询 `information_schema` 核对区域初始化 SQL 的表和字段；不执行 SQL、不造业务数据、不执行迁移 |
 | 本地质量 | `local-db-full-acceptance.ps1` | 只允许本机 MySQL 的受控 SQL 验收；非 dry-run 会写本地测试库 |
 | 本地质量 | `mapper-scan-contract.mjs` | 离线检查 Mapper 注解与扫描入口，不启动 Spring、不连接数据库 |
 | 本地质量 | `java-quality-summary.mjs` | 聚合 Maven 拓扑、OpenAPI、JaCoCo 和 SpotBugs 已有报告，不启动服务 |
diff --git a/scripts/agents-index-contract.ps1 b/scripts/agents-index-contract.ps1
index f9d071fde..0962b711d 100644
--- a/scripts/agents-index-contract.ps1
+++ b/scripts/agents-index-contract.ps1
@@ -267,10 +267,10 @@ $coloadOpenApi = Read-RequiredText (Join-Path $backendRoot 'firstleg/src/main/re
 Assert-Contains $businessIndex 'modules/unified-orders/api/coLoadGroups.ts' '根同柜不可拆组入口'
 Assert-Contains $adminAgents '成员数是入仓片段数，不等于订单票数' 'Admin 同柜成员语义'
 Assert-Contains $backendAgents 'loading/coload/controller/PlatformColoadGroupController.java' '后端同柜不可拆组入口'
-Assert-Contains $firstlegAgents '服务端冻结每票全部 `WAIT_SPLIT` 可用入仓片段与满箱数' 'Firstleg 同柜建组边界'
+Assert-Contains $firstlegAgents '服务端允许待审核、待测量/测量中、待分柜及装柜中订单' 'Firstleg 同柜建组边界'
 Assert-Contains $warehouseAgents 'scripts/warehouse-public-master-data-contract.test.mjs' 'Warehouse 局部脚本入口'
 Assert-Contains $coloadOpenApi '允许跨客户及不同目的仓港成组，仅要求国内仓和渠道一致' '同柜资格 OpenAPI'
-Assert-Contains $coloadOpenApi '服务端解析每个订单全部 WAIT_SPLIT' '同柜订单展开 OpenAPI'
+Assert-Contains $coloadOpenApi '待分柜或装柜中的全部有效入仓片段' '同柜订单展开 OpenAPI'
 Assert-Contains $rootAgents '用户可见页面、提示和错误不得展示或以内部数据库 ID 作为业务编号回退' '根业务编号展示边界'
 Assert-Contains $adminAgents '/loading-plans/{planId}/lifecycle' 'Admin 装柜清单生命周期入口'
 Assert-Contains $adminAgents '合柜报关 / 同柜不可拆组' 'Admin 合柜报关别名入口'
diff --git a/scripts/database-schema-contract.mjs b/scripts/database-schema-contract.mjs
new file mode 100644
index 000000000..f5728f720
--- /dev/null
+++ b/scripts/database-schema-contract.mjs
@@ -0,0 +1,158 @@
+#!/usr/bin/env node
+
+import { readFile } from 'node:fs/promises'
+import { spawnSync } from 'node:child_process'
+import path from 'node:path'
+import process from 'node:process'
+import { fileURLToPath } from 'node:url'
+
+const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url))
+const REPO_ROOT = path.resolve(SCRIPT_DIR, '..')
+const SQL_ROOT = path.join(REPO_ROOT, 'deploy', 'sql')
+const MYSQL_CANDIDATES = [process.env.MYSQL_BIN, 'mysql'].filter(Boolean)
+
+const REGIONS = {
+  CN: {
+    sql: path.join(SQL_ROOT, '头程数据库统一增量-MySQL8.sql'),
+    schemas: [
+      'baiyue_auth', 'baiyue_iam', 'baiyue_order', 'baiyue_warehouse',
+      'baiyue_firstleg', 'baiyue_file', 'baiyue_audit', 'baiyue_event_bridge',
+      'baiyue_finance',
+    ],
+  },
+  OVERSEAS: {
+    sql: path.join(SQL_ROOT, '海外区域统一增量-MySQL8.sql'),
+    schemas: ['baiyue_lastleg', 'baiyue_lastlag_warehouse', 'baiyue_event_bridge_overseas'],
+  },
+}
+
+function usage() {
+  console.log('用法：node scripts/database-schema-contract.mjs --region CN|OVERSEAS|BOTH')
+  console.log('必需环境变量：SCHEMA_CHECK_HOST、SCHEMA_CHECK_PORT、SCHEMA_CHECK_USERNAME、SCHEMA_CHECK_PASSWORD')
+  console.log('可选环境变量：MYSQL_BIN；默认只读查询 information_schema，不执行 SQL')
+}
+
+function parseRegion(argv) {
+  const index = argv.indexOf('--region')
+  const region = index >= 0 ? argv[index + 1] : 'BOTH'
+  if (region === 'BOTH') return ['CN', 'OVERSEAS']
+  if (!REGIONS[region]) throw new Error(`不支持的区域：${region}`)
+  return [region]
+}
+
+function config() {
+  const keys = ['SCHEMA_CHECK_HOST', 'SCHEMA_CHECK_PORT', 'SCHEMA_CHECK_USERNAME', 'SCHEMA_CHECK_PASSWORD']
+  const missing = keys.filter((key) => !process.env[key])
+  if (missing.length) throw new Error(`缺少只读数据库环境变量：${missing.join(', ')}`)
+  return Object.fromEntries(keys.map((key) => [key, process.env[key]]))
+}
+
+function parseExpected(sql) {
+  const expected = new Map()
+  let currentSchema = ''
+  const lines = sql.split(/\r?\n/)
+  for (let index = 0; index < lines.length; index += 1) {
+    const use = lines[index].match(/^USE\s+`?([a-z][a-z0-9_]*)`?\s*;/i)
+    if (use) {
+      currentSchema = use[1]
+      continue
+    }
+    const start = lines[index].match(/^CREATE TABLE\s+(?:IF NOT EXISTS\s+)?(?:`?([a-z][a-z0-9_]*)`?\.)?`?([a-z][a-z0-9_]*)`?\s*\(/i)
+    if (!start) continue
+    const body = []
+    index += 1
+    while (index < lines.length && !/^\) ENGINE=/i.test(lines[index])) {
+      body.push(lines[index])
+      index += 1
+    }
+    const schema = start[1] || currentSchema
+    const table = start[2]
+    const columns = new Set()
+    for (const line of body) {
+      const field = line.match(/^\s+`([a-z][a-z0-9_]*)`\s+/i)
+      if (field) columns.add(field[1])
+    }
+    if (!columns.size) continue
+    const key = schema ? `${schema}.${table}` : table
+    expected.set(key, columns)
+  }
+  return expected
+}
+
+function mysql(cfg, database, sql) {
+  let lastError = ''
+  for (const executable of MYSQL_CANDIDATES) {
+    const result = spawnSync(executable, [
+      '--protocol=TCP', '-h', cfg.SCHEMA_CHECK_HOST, '-P', cfg.SCHEMA_CHECK_PORT,
+      '-u', cfg.SCHEMA_CHECK_USERNAME, '--database', database,
+      '--batch', '--skip-column-names', '--default-character-set=utf8mb4',
+    ], { input: sql, encoding: 'utf8', env: { ...process.env, MYSQL_PWD: cfg.SCHEMA_CHECK_PASSWORD } })
+    if (result.error?.code === 'ENOENT') {
+      lastError = result.error.message
+      continue
+    }
+    if (result.status !== 0) throw new Error((result.stderr || result.stdout || 'mysql 查询失败').trim())
+    return result.stdout
+  }
+  throw new Error(`找不到 mysql 客户端：${lastError}`)
+}
+
+function actualSchema(cfg, schema) {
+  const sql = 'SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = DATABASE() ORDER BY table_name, ordinal_position;'
+  const output = mysql(cfg, schema, sql)
+  const actual = new Map()
+  for (const line of output.trim().split(/\r?\n/).filter(Boolean)) {
+    const [table, column] = line.split('\t')
+    if (!table || !column) continue
+    if (!actual.has(table)) actual.set(table, new Set())
+    actual.get(table).add(column)
+  }
+  return actual
+}
+
+function compare(expected, actual) {
+  const missingTables = []
+  const missingColumns = []
+  for (const [table, columns] of expected) {
+    const current = actual.get(table)
+    if (!current) {
+      missingTables.push(table)
+      continue
+    }
+    for (const column of columns) if (!current.has(column)) missingColumns.push(`${table}.${column}`)
+  }
+  return { missingTables, missingColumns }
+}
+
+async function main() {
+  const argv = process.argv.slice(2)
+  if (argv.includes('--help') || argv.includes('-h')) return usage()
+  const cfg = config()
+  const regions = parseRegion(argv)
+  const failures = []
+  for (const region of regions) {
+    const definition = REGIONS[region]
+    const sql = await readFile(definition.sql, 'utf8')
+    const expectedAll = parseExpected(sql)
+    for (const schema of definition.schemas) {
+      const expected = new Map([...expectedAll].filter(([key]) => key.startsWith(`${schema}.`)).map(([key, columns]) => [key.slice(schema.length + 1), columns]))
+      const actual = actualSchema(cfg, schema)
+      const result = compare(expected, actual)
+      console.log(`${region} ${schema}: expected_tables=${expected.size} actual_tables=${actual.size} missing_tables=${result.missingTables.length} missing_columns=${result.missingColumns.length}`)
+      if (result.missingTables.length) console.log(`  missing_tables=${result.missingTables.join(',')}`)
+      if (result.missingColumns.length) console.log(`  missing_columns=${result.missingColumns.join(',')}`)
+      failures.push(...result.missingTables.map((item) => `${region}/${schema}/${item}`), ...result.missingColumns.map((item) => `${region}/${schema}/${item}`))
+    }
+  }
+  if (failures.length) {
+    console.error(`DATABASE_SCHEMA_CONTRACT_FAIL missing=${failures.length}`)
+    process.exitCode = 1
+    return
+  }
+  console.log(`DATABASE_SCHEMA_CONTRACT_PASS regions=${regions.join(',')}`)
+}
+
+main().catch((error) => {
+  console.error(`DATABASE_SCHEMA_CONTRACT_ERROR: ${error.message}`)
+  process.exitCode = 1
+})

From 0e52f4e11e490511a4c87bb86d5dbc8d1822f8e7 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 15:03:24 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E4=BC=98=E5=8C=96x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                                   |  5 +++
 deploy/docker-compose.yml                     |  1 +
 .../client/PendingReviewOrderClient.java      |  9 ++++
 .../coload/persistence/ColoadGroupMapper.java |  5 +++
 .../coload/service/ColoadGroupService.java    | 44 +++++++++++++++++++
 .../resources/openapi/coload-groups-v1.yaml   |  3 +-
 .../coload/ColoadGroupServiceTest.java        | 41 +++++++++++++++++
 .../coload/ColoadGroupSqlContractTest.java    | 12 +++++
 order/AGENTS.md                               |  2 +-
 .../InternalPendingReviewOrderController.java | 10 +++++
 .../order/dto/PendingReviewOrderDtos.java     |  7 +++
 .../PendingReviewOrderQueryService.java       | 25 +++++++++--
 .../src/main/resources/openapi/order-v1.yaml  | 41 +++++++++++++++++
 ...ernalPendingReviewOrderControllerTest.java | 10 +++++
 ...PendingReviewOrderOpenApiContractTest.java |  3 ++
 .../PendingReviewOrderQueryServiceTest.java   | 33 ++++++++++++++
 16 files changed, 246 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f3ec9511c..e0f8a152a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -56,6 +56,8 @@ def commonPathServices = [
 ]
 
 def databaseMigrationPaths = ['deploy/sql/']
+// 暂停数据库结构只读门禁；保留实现，完成 Credentials 配置后改为 true。
+def databaseSchemaContractEnabled = false
 
 def downstreamResults = [:]
 def downstreamBuildUrls = [:]
@@ -370,6 +372,9 @@ pipeline {
         }
 
         stage('数据库结构只读门禁') {
+            when {
+                expression { databaseSchemaContractEnabled }
+            }
             agent { label 'java-builder' }
             steps {
                 script {
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 4b703a3c0..f33ade8d6 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -163,6 +163,7 @@ services:
       FILE_DB_USERNAME: ${FILE_DB_USERNAME}
       FILE_DB_PASSWORD: ${FILE_DB_PASSWORD}
       FILE_STORAGE_ROOT: /data/files
+      PDA_UPDATE_PUBLIC_BASE_URL: ${PDA_UPDATE_PUBLIC_BASE_URL:-}
       JAVA_TOOL_OPTIONS: "-Xms1g -Xmx2g -XX:+ExitOnOutOfMemoryError -Dfile.encoding=UTF-8"
       # Compose 会插值整份文件，即使只部署 auth 等其他服务；File 的必填校验由 deploy-services.sh 按服务执行。
       ROCKETMQ_NAME_SERVER: ${ROCKETMQ_NAME_SERVER-}
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java
index bad194527..e70c5bbdf 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/client/PendingReviewOrderClient.java
@@ -4,6 +4,8 @@ import com.baiyue.common.core.api.ApiResponse;
 import com.baiyue.common.core.api.PageResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -29,6 +31,13 @@ public interface PendingReviewOrderClient {
         @RequestParam long page,
         @RequestParam long size);
 
+    @PostMapping("/batch")
+    ApiResponse<List<Row>> batch(
+        @RequestHeader("X-Internal-Service-Token") String token,
+        @RequestBody BatchRequest request);
+
+    record BatchRequest(List<Long> orderIds) {}
+
     record Row(Long orderId, String orderNo, String inboundCode, Long customerId,
                String customerName, Long warehouseId, String channelCode, String channelName,
                int totalPackageCount, LocalDateTime createdAt, LocalDateTime expectedArrivalAt,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
index eef7d4cfb..2be528ce5 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/persistence/ColoadGroupMapper.java
@@ -13,6 +13,11 @@ import static com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRo
 /** 同柜不可拆组在 Firstleg 单库内的唯一持久化入口。 */
 @Mapper
 public interface ColoadGroupMapper {
+    @Select({"<script>", "SELECT DISTINCT order_id FROM fl_inbound_order WHERE deleted=0 AND order_id IN",
+        "<foreach collection='orderIds' item='orderId' open='(' separator=',' close=')'>",
+        "#{orderId}", "</foreach>", "</script>"})
+    List<Long> existingOrderIds(@Param("orderIds") List<Long> orderIds);
+
     @Select({"<script>", """
         SELECT o.tenant_id tenantId,o.order_id orderId,o.order_no orderNo,
                o.id inboundId,o.inbound_code inboundCode,o.process_status processStatus,
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
index dfa38d9cf..b5b452245 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/loading/coload/service/ColoadGroupService.java
@@ -13,6 +13,10 @@ import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.Comm
 import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.GroupRow;
 import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.InboundCandidateRow;
 import com.baiyue.firstleg.loading.coload.port.ColoadGroupAssignmentPort;
+import com.baiyue.firstleg.client.OrderCargoClient;
+import com.baiyue.firstleg.client.PendingReviewOrderClient;
+import com.baiyue.firstleg.service.InboundOrderCreationService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +45,10 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
 
     @Resource
     private ColoadGroupMapper mapper;
+    @Resource private PendingReviewOrderClient pendingReviewOrders;
+    @Resource private OrderCargoClient orderCargoClient;
+    @Resource private InboundOrderCreationService inboundOrderCreationService;
+    @Value("${baiyue.security.internal-service-token:}") private String internalToken;
 
     @Transactional
     public GroupSnapshot create(List<Long> requestedOrderIds, String idempotencyKey,
@@ -51,6 +59,7 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
         CommandClaim claim = claim(operatorId, "CREATE", key, requestHash);
         if (claim.replayGroupId() != null) return requiredSnapshot(claim.replayGroupId());
 
+        preparePendingReviewInbounds(orderIds);
         List<InboundCandidateRow> candidates = authoritativeCandidates(orderIds, null);
         validateSameRoute(candidates);
         Long lockedPlanId = validateAllocationState(candidates);
@@ -265,6 +274,37 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
         return resolved;
     }
 
+    private void preparePendingReviewInbounds(List<Long> orderIds) {
+        Set<Long> existing = Set.copyOf(mapper.existingOrderIds(orderIds));
+        List<Long> missing = orderIds.stream().filter(orderId -> !existing.contains(orderId)).toList();
+        if (missing.isEmpty()) return;
+        try {
+            var response = pendingReviewOrders.batch(internalToken,
+                new PendingReviewOrderClient.BatchRequest(missing));
+            if (response == null || !response.successful() || response.data() == null) throw unavailable();
+            for (PendingReviewOrderClient.Row row : response.data()) {
+                if (row == null || row.orderId() == null || !missing.contains(row.orderId())
+                    || row.customerId() == null || !"PENDING_REVIEW".equals(row.mainStatus())) {
+                    throw conflict("待审核订单权威快照已变化，请刷新后重试");
+                }
+                var snapshotResponse = orderCargoClient.inboundSnapshot(
+                    internalToken, row.customerId(), row.orderId());
+                if (snapshotResponse == null || !snapshotResponse.successful()
+                    || snapshotResponse.data() == null
+                    || snapshotResponse.data().tenantId() != row.customerId()
+                    || snapshotResponse.data().orderId() != row.orderId()
+                    || !Objects.equals(snapshotResponse.data().inboundCode(), row.inboundCode())) {
+                    throw conflict("待审核订单履约快照已变化，请刷新后重试");
+                }
+                inboundOrderCreationService.prepareFromDraft(snapshotResponse.data());
+            }
+        } catch (BizException exception) {
+            throw exception;
+        } catch (RuntimeException exception) {
+            throw unavailable();
+        }
+    }
+
     private String unavailableReason(InboundCandidateRow row, Long allowedGroupId) {
         if (row.getTenantId() == null || row.getTenantId() <= 0
             || row.getInboundId() == null || row.getInboundId() <= 0
@@ -470,6 +510,10 @@ public class ColoadGroupService implements ColoadGroupAssignmentPort {
         return new BizException(ResultCode.CONFLICT, message);
     }
 
+    private static BizException unavailable() {
+        return new BizException(ResultCode.INTERNAL_ERROR, "待审核订单权威服务暂不可用");
+    }
+
     private record CommandClaim(long commandId, Long replayGroupId) {
     }
 }
diff --git a/firstleg/src/main/resources/openapi/coload-groups-v1.yaml b/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
index abe56c392..cf671fb3d 100644
--- a/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
+++ b/firstleg/src/main/resources/openapi/coload-groups-v1.yaml
@@ -9,7 +9,8 @@ paths:
       summary: 创建同柜不可拆组
       description: >-
         需要 platform:firstleg:smart-loading:assign。orderIds 至少2项；服务端解析每个订单处于待审核、
-        待测量/测量中、待分柜或装柜中的全部有效入仓片段，要求国内仓和渠道一致，并冻结全部片段及其满箱数。
+        待测量/测量中、待分柜或装柜中的全部有效入仓片段；待审核订单先经 Order 批量权威核验并幂等准备
+        PREPARING 入库投影。全部成员要求国内仓和渠道一致，并冻结全部片段及其满箱数。
         全部成员未进入装柜计划时创建 ACTIVE 组；全部成员已经按满箱数完整进入同一个装柜计划时直接创建并
         锁定为 LOCKED 组。仅部分成员进柜、分散在不同装柜计划、箱数不完整、已属于其他活动组或权威仓库/
         渠道快照缺失时拒绝。跨成员仓库或渠道不一致时返回入仓码及仓库名/渠道名；平台错误不得展示
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
index 587578fcc..e2a4fffd8 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupServiceTest.java
@@ -1,6 +1,11 @@
 package com.baiyue.firstleg.loading.coload;
 
 import com.baiyue.common.core.exception.BizException;
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.firstleg.client.OrderCargoClient;
+import com.baiyue.firstleg.client.PendingReviewOrderClient;
+import com.baiyue.firstleg.dto.OrderApprovedInboundCommand;
+import com.baiyue.firstleg.service.InboundOrderCreationService;
 import com.baiyue.firstleg.loading.coload.persistence.ColoadGroupMapper;
 import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.GroupRow;
 import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.CommandRow;
@@ -12,6 +17,7 @@ import com.baiyue.firstleg.loading.coload.persistence.ColoadPersistenceRows.Orde
 import com.baiyue.firstleg.loading.coload.service.ColoadGroupService;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
 import org.mockito.ArgumentCaptor;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@ -35,9 +41,19 @@ import static org.mockito.Mockito.when;
 class ColoadGroupServiceTest {
     @MockBean
     private ColoadGroupMapper mapper;
+    @MockBean private PendingReviewOrderClient pendingReviewOrders;
+    @MockBean private OrderCargoClient orderCargoClient;
+    @MockBean private InboundOrderCreationService inboundOrderCreationService;
     @Resource
     private ColoadGroupService service;
 
+    @BeforeEach
+    void allowNoPendingReviewProjectionByDefault() {
+        when(mapper.existingOrderIds(any())).thenAnswer(invocation -> invocation.getArgument(0));
+        when(pendingReviewOrders.batch(anyString(), any(PendingReviewOrderClient.BatchRequest.class)))
+            .thenReturn(ApiResponse.success(List.of()));
+    }
+
     @Test
     void readsCrossCustomerTwoMemberGroupByEitherInboundCodeWithoutInternalIdentifiers() {
         when(mapper.groupsByInboundCode("IN-A")).thenReturn(List.of(lookup(500L, "ACTIVE")));
@@ -154,6 +170,31 @@ class ColoadGroupServiceTest {
         verify(mapper).insertMember(anyLong(), eq(groupId.getValue()), eq(202L), eq(12L), eq(1002L), eq(50));
     }
 
+    @Test
+    void provisionsSelectedPendingReviewOrderBeforeResolvingColoadCandidates() {
+        PendingReviewOrderClient.Row pending = new PendingReviewOrderClient.Row(
+            11L, "FO-11", "IN-1001", 101L, "客户", 9L, "CH", "美森海卡",
+            30, LocalDateTime.now(), null, "PENDING_REVIEW");
+        OrderApprovedInboundCommand snapshot = new OrderApprovedInboundCommand(
+            101L, 11L, "FO-11", "IN-1001", 101L, "客户", 9L, "义乌仓",
+            null, null, null, "FIRST_LEG", "CH", "美森海卡", null, null,
+            null, null, null, false, "FBA", null, null, null, null, null, null, 30);
+        when(pendingReviewOrders.batch(anyString(), any(PendingReviewOrderClient.BatchRequest.class)))
+            .thenReturn(ApiResponse.success(List.of(pending)));
+        when(mapper.existingOrderIds(List.of(11L, 12L))).thenReturn(List.of(12L));
+        when(orderCargoClient.inboundSnapshot(anyString(), eq(101L), eq(11L)))
+            .thenReturn(ApiResponse.success(snapshot));
+        when(inboundOrderCreationService.prepareFromDraft(snapshot)).thenReturn(1001L);
+        stubSuccessfulCreate("pending-review", List.of(
+            candidate(101L, 11L, 1001L, 30), candidate(202L, 12L, 1002L, 50)), "ACTIVE", null);
+
+        var result = service.create(List.of(11L, 12L), "pending-review", 7L, "operator");
+
+        assertThat(result.status()).isEqualTo("ACTIVE");
+        verify(inboundOrderCreationService).prepareFromDraft(snapshot);
+        verify(pendingReviewOrders).batch(anyString(), eq(new PendingReviewOrderClient.BatchRequest(List.of(11L))));
+    }
+
     @org.junit.jupiter.params.ParameterizedTest
     @org.junit.jupiter.params.provider.ValueSource(strings = {
         "PREPARING", "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED",
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupSqlContractTest.java
index 3ed5a8802..6609b0bcf 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/loading/coload/ColoadGroupSqlContractTest.java
@@ -49,6 +49,9 @@ class ColoadGroupSqlContractTest {
             .contains("FROM fl_inbound_order o")
             .contains("o.order_no orderNo", "o.inbound_code inboundCode")
             .contains("o.warehouse_name warehouseName", "o.channel_name channelName")
+            .contains("activeAllocationPlanCount", "activeAllocationPlanId", "activeAllocatedPackageCount")
+            .contains("COUNT(DISTINCT item.loading_plan_id)", "MIN(item.loading_plan_id)")
+            .contains("COALESCE(SUM(item.package_count),0)")
             .contains("FROM fl_loading_plan_item item")
             .contains("item.deleted=0")
             .contains("member.active_flag=1")
@@ -63,6 +66,15 @@ class ColoadGroupSqlContractTest {
             .doesNotContain("destination_code");
     }
 
+    @Test
+    void mapperDetectsExistingFirstlegProjectionsBeforeCallingThePendingReviewOwner() throws Exception {
+        Method method = ColoadGroupMapper.class.getDeclaredMethod("existingOrderIds", java.util.List.class);
+        String sql = String.join(" ", method.getAnnotation(Select.class).value());
+        assertThat(sql).contains("SELECT DISTINCT order_id FROM fl_inbound_order")
+            .contains("deleted=0", "order_id IN")
+            .doesNotContain("FOR UPDATE");
+    }
+
     @Test
     void inboundCodeReadKeepsConsumedGroupsAndAllFrozenEffectiveFragments() throws Exception {
         Method lookup = ColoadGroupMapper.class.getDeclaredMethod("groupsByInboundCode", String.class);
diff --git a/order/AGENTS.md b/order/AGENTS.md
index d6c52ef40..b88897f4f 100644
--- a/order/AGENTS.md
+++ b/order/AGENTS.md
@@ -14,7 +14,7 @@
 | 平台订单 API | `controller/PlatformFirstLegOrderController.java` |
 | 平台批量审核预览 | `controller/PlatformFirstLegOrderController.java` 的 `/batch-review-preview`、`service/BatchOrderReviewPreviewService.java`、`dto/BatchOrderReviewPreviewResponse.java`；按目标客户和请求顺序一次返回订单、中文货物摘要、渠道、目的仓及逐项 `canApprove/blockReason`，实现固定两次批量查询，禁止前端逐票读取详情 |
 | 统一订单查询、审核优先状态与稳定渠道编码 | `service/UnifiedOrderQueryService.java`、`dto/UnifiedOrderResponse.java`、`src/main/resources/openapi/order-v1.yaml`；`channelCode` 直接来自 Order/Firstleg 权威快照，只用于业务校验，不得由 `channelName` 推导。Order 为 `SUBMITTED` 时即使已有 Firstleg 入库投影，统一主状态/下一动作仍固定为 `PENDING_REVIEW/APPROVE_ORDER` |
-| Firstleg 智能装柜待审核候选 | `controller/InternalPendingReviewOrderController.java`、`service/PendingReviewOrderQueryService.java`、`dto/PendingReviewOrderDtos.java`、`repository/OrderRepository.java`；内部入口 `/internal/order/v1/pending-review-orders` 只接受服务令牌，只分页返回未删除的 `SUBMITTED` 头程订单并固定投影为 `PENDING_REVIEW`，按 `Asia/Shanghai` 自然日过滤、`created_at DESC, id DESC` 稳定排序，不读取或修复 Firstleg 投影 |
+| Firstleg 智能装柜待审核候选 | `controller/InternalPendingReviewOrderController.java`、`service/PendingReviewOrderQueryService.java`、`dto/PendingReviewOrderDtos.java`、`repository/OrderRepository.java`；内部入口 `/internal/order/v1/pending-review-orders` 只接受服务令牌，只分页返回未删除的 `SUBMITTED` 头程订单并固定投影为 `PENDING_REVIEW`，按 `Asia/Shanghai` 自然日过滤、`created_at DESC, id DESC` 稳定排序；`POST /batch` 按最多 100 个订单 ID 批量核验待审核状态，供同柜建组幂等准备 Firstleg `PREPARING` 投影 |
 | 平台版本化修改客户原始申报 | `controller/PlatformUnifiedOrderController.java` 的 `PUT /api/platform/v1/orders/{orderId}/declaration`、`service/OrderDeclarationUpdateService.java`、`dto/OrderDeclarationDtos.java`；权限 `platform:order:declaration:edit`，货物以订单内 `itemNo` 定位并保持行集合完整，契约 `src/main/resources/openapi/order-v1.yaml` |
 | 申报同步、渠道履约/计价门禁 | `service/OrderFulfillmentChannelChangeGuard.java`、`OrderPricingChannelGuard.java`、`OrderInboundOutboxPublisher.java`，内部客户端 `FirstlegInboundClient.java`、`FirstlegPricingClient.java`；审核后通过版本化 `ORDER_DECLARATION_UPDATED_V1` 同步 Firstleg |
 | 入仓码业务关系摘要 | `service/InboundCodeAssociationService.java`、`dto/InboundCodeAssociationSummary.java`、平台/客户 `FirstLegOrderController` 的 `/inbound-code-associations/{inboundCode}`；客户入口必须按认证客户隔离 |
diff --git a/order/src/main/java/com/baiyue/order/controller/InternalPendingReviewOrderController.java b/order/src/main/java/com/baiyue/order/controller/InternalPendingReviewOrderController.java
index a24209fc6..9e03b6923 100644
--- a/order/src/main/java/com/baiyue/order/controller/InternalPendingReviewOrderController.java
+++ b/order/src/main/java/com/baiyue/order/controller/InternalPendingReviewOrderController.java
@@ -12,6 +12,8 @@ import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -40,6 +42,14 @@ public class InternalPendingReviewOrderController {
         return ApiResponse.success(service.page(query));
     }
 
+    @PostMapping("/batch")
+    public ApiResponse<java.util.List<PendingReviewOrderDtos.Row>> batch(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @Valid @RequestBody PendingReviewOrderDtos.BatchRequest request) {
+        requireToken(token);
+        return ApiResponse.success(service.batch(request.orderIds()));
+    }
+
     private void requireToken(String token) {
         byte[] supplied = token == null ? new byte[0] : token.getBytes(StandardCharsets.UTF_8);
         if (!MessageDigest.isEqual(expectedToken, supplied)) {
diff --git a/order/src/main/java/com/baiyue/order/dto/PendingReviewOrderDtos.java b/order/src/main/java/com/baiyue/order/dto/PendingReviewOrderDtos.java
index 6ddd55506..b0e0923e5 100644
--- a/order/src/main/java/com/baiyue/order/dto/PendingReviewOrderDtos.java
+++ b/order/src/main/java/com/baiyue/order/dto/PendingReviewOrderDtos.java
@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -41,6 +43,11 @@ public final class PendingReviewOrderDtos {
         }
     }
 
+    public record BatchRequest(
+        @NotEmpty @Size(min = 1, max = 100) List<@NotNull @Min(1) Long> orderIds
+    ) {
+    }
+
     public record Row(
         @Schema(type = "string", pattern = "^[1-9][0-9]*$") Long orderId,
         String orderNo,
diff --git a/order/src/main/java/com/baiyue/order/service/PendingReviewOrderQueryService.java b/order/src/main/java/com/baiyue/order/service/PendingReviewOrderQueryService.java
index bffdbd54e..d85e50b5f 100644
--- a/order/src/main/java/com/baiyue/order/service/PendingReviewOrderQueryService.java
+++ b/order/src/main/java/com/baiyue/order/service/PendingReviewOrderQueryService.java
@@ -5,6 +5,8 @@ import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.order.dto.PendingReviewOrderDtos;
 import com.baiyue.order.entity.OrderCargoEntity;
+import com.baiyue.order.entity.OrderEntity;
+import com.baiyue.order.entity.OrderStatus;
 import com.baiyue.order.repository.OrderRepository;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -40,16 +42,33 @@ public class PendingReviewOrderQueryService {
         var source = orders.pendingReviewPage(channelCodes, query.warehouseId(), query.customerId(),
             normalize(query.inboundCode()), createdFrom, createdBefore, expectedArrivalFrom,
             expectedArrivalBefore, query.excludedOrderIds(), query.page(), query.size());
-        List<Long> orderIds = source.records().stream().map(order -> order.getId()).toList();
+        return new PageResult<>(rows(source.records()), source.page(), source.size(), source.total(), source.pages());
+    }
+
+    public List<PendingReviewOrderDtos.Row> batch(List<Long> requestedOrderIds) {
+        if (requestedOrderIds == null || requestedOrderIds.isEmpty() || requestedOrderIds.size() > 100
+            || requestedOrderIds.stream().anyMatch(java.util.Objects::isNull)
+            || requestedOrderIds.stream().anyMatch(id -> id <= 0)
+            || requestedOrderIds.stream().distinct().count() != requestedOrderIds.size()) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "待审核订单ID必须为1至100个不同的正整数");
+        }
+        Map<Long, OrderEntity> byId = orders.findByIds(null, requestedOrderIds).stream()
+            .filter(order -> !Boolean.TRUE.equals(order.getDeleted()))
+            .filter(order -> order.getStatus() == OrderStatus.SUBMITTED)
+            .collect(Collectors.toMap(OrderEntity::getId, order -> order));
+        return rows(requestedOrderIds.stream().map(byId::get).filter(java.util.Objects::nonNull).toList());
+    }
+
+    private List<PendingReviewOrderDtos.Row> rows(List<OrderEntity> source) {
+        List<Long> orderIds = source.stream().map(OrderEntity::getId).toList();
         Map<Long, Integer> packageCounts = orders.findCargoByOrderIds(null, orderIds).stream()
             .collect(Collectors.groupingBy(OrderCargoEntity::getOrderId,
                 Collectors.summingInt(cargo -> cargo.getPackageCount() == null ? 0 : cargo.getPackageCount())));
-        var rows = source.records().stream().map(order -> new PendingReviewOrderDtos.Row(
+        return source.stream().map(order -> new PendingReviewOrderDtos.Row(
             order.getId(), order.getOrderNo(), order.getInboundCode(), order.getCustomerId(),
             order.getCustomerName(), order.getReceivingWarehouseId(), order.getChannelCode(),
             order.getChannelName(), packageCounts.getOrDefault(order.getId(), 0), order.getCreatedAt(),
             order.getExpectedArrivalAt(), "PENDING_REVIEW")).toList();
-        return new PageResult<>(rows, source.page(), source.size(), source.total(), source.pages());
     }
 
     private static List<String> normalizeChannelCodes(List<String> values) {
diff --git a/order/src/main/resources/openapi/order-v1.yaml b/order/src/main/resources/openapi/order-v1.yaml
index 3d3aa02da..9a84ea738 100644
--- a/order/src/main/resources/openapi/order-v1.yaml
+++ b/order/src/main/resources/openapi/order-v1.yaml
@@ -137,6 +137,30 @@ paths:
             application/json:
               schema: {$ref: '#/components/schemas/PendingReviewOrderPageEnvelope'}
         '403': {description: 内部服务令牌无效}
+  /internal/order/v1/pending-review-orders/batch:
+    post:
+      security: []
+      summary: Firstleg 按订单 ID 批量核验 Order 权威待审核订单
+      description: >-
+        仅接受内部服务令牌。只返回请求集合中未删除且 status=SUBMITTED 的订单，按请求顺序返回；
+        供订单列表创建同柜组前幂等准备 Firstleg PREPARING 入库投影，不返回已审核或失效订单。
+      parameters:
+        - name: X-Internal-Service-Token
+          in: header
+          required: true
+          schema: {type: string}
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/PendingReviewOrderBatchRequest'}
+      responses:
+        '200':
+          description: Order 权威待审核订单集合
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/PendingReviewOrderListEnvelope'}
+        '403': {description: 内部服务令牌无效}
   /internal/exports/v1/DOMESTIC_WAREHOUSE_ORDER_LIST/batches:
     post:
       security: []
@@ -1293,6 +1317,23 @@ components:
             size: {type: integer, format: int64, minimum: 1}
             total: {type: integer, format: int64, minimum: 0}
             pages: {type: integer, format: int64, minimum: 0}
+    PendingReviewOrderBatchRequest:
+      type: object
+      additionalProperties: false
+      required: [orderIds]
+      properties:
+        orderIds:
+          type: array
+          minItems: 1
+          maxItems: 100
+          uniqueItems: true
+          items: {type: string, pattern: '^[1-9][0-9]*$'}
+    PendingReviewOrderListEnvelope:
+      type: object
+      properties:
+        code: {type: string, example: '200'}
+        message: {type: string}
+        data: {type: array, items: {$ref: '#/components/schemas/PendingReviewOrderRow'}}
     PendingReviewOrderRow:
       type: object
       required: [orderId, orderNo, inboundCode, customerId, customerName, warehouseId, channelCode, channelName, totalPackageCount, createdAt, expectedArrivalAt, mainStatus]
diff --git a/order/src/test/java/com/baiyue/order/controller/InternalPendingReviewOrderControllerTest.java b/order/src/test/java/com/baiyue/order/controller/InternalPendingReviewOrderControllerTest.java
index a2464af2e..8af9f88a3 100644
--- a/order/src/test/java/com/baiyue/order/controller/InternalPendingReviewOrderControllerTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/InternalPendingReviewOrderControllerTest.java
@@ -35,4 +35,14 @@ class InternalPendingReviewOrderControllerTest {
         assertThat(controller.page("0123456789abcdef0123456789abcdef", query).data()).isSameAs(page);
         verify(service).page(query);
     }
+
+    @Test
+    void batchUsesTheSameInternalAuthenticationBoundary() {
+        var request = new PendingReviewOrderDtos.BatchRequest(List.of(101L, 102L));
+        when(service.batch(request.orderIds())).thenReturn(List.of());
+
+        assertThatThrownBy(() -> controller.batch("wrong", request)).isInstanceOf(BizException.class);
+        assertThat(controller.batch("0123456789abcdef0123456789abcdef", request).data()).isEmpty();
+        verify(service).batch(request.orderIds());
+    }
 }
diff --git a/order/src/test/java/com/baiyue/order/controller/PendingReviewOrderOpenApiContractTest.java b/order/src/test/java/com/baiyue/order/controller/PendingReviewOrderOpenApiContractTest.java
index fd268142d..33729d56b 100644
--- a/order/src/test/java/com/baiyue/order/controller/PendingReviewOrderOpenApiContractTest.java
+++ b/order/src/test/java/com/baiyue/order/controller/PendingReviewOrderOpenApiContractTest.java
@@ -13,12 +13,15 @@ class PendingReviewOrderOpenApiContractTest {
         String yaml = Files.readString(Path.of("src/main/resources/openapi/order-v1.yaml"));
         assertThat(yaml)
             .contains("/internal/order/v1/pending-review-orders:")
+            .contains("/internal/order/v1/pending-review-orders/batch:")
             .contains("channelCodes")
             .contains("createdStart")
             .contains("createdEnd")
             .contains("expectedArrivalStart")
             .contains("expectedArrivalEnd")
             .contains("excludedOrderIds")
+            .contains("PendingReviewOrderBatchRequest:")
+            .contains("PendingReviewOrderListEnvelope:")
             .contains("PendingReviewOrderRow:")
             .contains("expectedArrivalAt: {type: string, format: date-time, nullable: true}")
             .contains("mainStatus: {type: string, enum: [PENDING_REVIEW]}")
diff --git a/order/src/test/java/com/baiyue/order/service/PendingReviewOrderQueryServiceTest.java b/order/src/test/java/com/baiyue/order/service/PendingReviewOrderQueryServiceTest.java
index 4c48243bb..174e3a16c 100644
--- a/order/src/test/java/com/baiyue/order/service/PendingReviewOrderQueryServiceTest.java
+++ b/order/src/test/java/com/baiyue/order/service/PendingReviewOrderQueryServiceTest.java
@@ -5,6 +5,7 @@ import com.baiyue.common.core.exception.BizException;
 import com.baiyue.order.dto.PendingReviewOrderDtos;
 import com.baiyue.order.entity.OrderCargoEntity;
 import com.baiyue.order.entity.OrderEntity;
+import com.baiyue.order.entity.OrderStatus;
 import com.baiyue.order.repository.OrderRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -90,6 +91,38 @@ class PendingReviewOrderQueryServiceTest {
             null, null, null, null, null, List.of(), 1, 20))).isInstanceOf(BizException.class);
     }
 
+    @Test
+    void batchReturnsOnlyRequestedSubmittedOrdersInRequestOrder() {
+        OrderEntity submitted = order(101L, OrderStatus.SUBMITTED);
+        OrderEntity approved = order(102L, OrderStatus.APPROVED);
+        OrderEntity deleted = order(103L, OrderStatus.SUBMITTED); deleted.setDeleted(true);
+        when(repository.findByIds(null, List.of(103L, 101L, 102L))).thenReturn(List.of(approved, submitted, deleted));
+        when(repository.findCargoByOrderIds(null, List.of(101L))).thenReturn(List.of(cargo(101L, 4)));
+
+        var result = service.batch(List.of(103L, 101L, 102L));
+
+        assertThat(result).singleElement().satisfies(row -> {
+            assertThat(row.orderId()).isEqualTo(101L);
+            assertThat(row.totalPackageCount()).isEqualTo(4);
+            assertThat(row.mainStatus()).isEqualTo("PENDING_REVIEW");
+        });
+    }
+
+    @Test
+    void batchRejectsDuplicateOrInvalidOrderIds() {
+        assertThatThrownBy(() -> service.batch(List.of(101L, 101L))).isInstanceOf(BizException.class);
+        assertThatThrownBy(() -> service.batch(List.of(0L))).isInstanceOf(BizException.class);
+    }
+
+    private static OrderEntity order(long id, OrderStatus status) {
+        OrderEntity order = new OrderEntity();
+        order.setId(id); order.setStatus(status); order.setDeleted(false);
+        order.setOrderNo("FL" + id); order.setInboundCode("RK" + id);
+        order.setCustomerId(22L); order.setCustomerName("测试客户");
+        order.setReceivingWarehouseId(33L); order.setChannelCode("SEA-US"); order.setChannelName("美线");
+        return order;
+    }
+
     private static OrderCargoEntity cargo(long orderId, int packageCount) {
         OrderCargoEntity cargo = new OrderCargoEntity();
         cargo.setOrderId(orderId); cargo.setPackageCount(packageCount);

From 02844da360d2ddc0e7aa711a07d95c65bddb078c Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sun, 20 Sep 2026 15:06:17 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E8=B4=B4=E6=A0=87=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=82=A8=E8=BD=AC=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auth/src/main/resources/application-dev.yml   |   4 +
 deploy/sql/海外区域统一增量-MySQL8.sql        |   9 +-
 .../InternalBusinessFileController.java       |   9 +
 .../service/InternalBusinessFileService.java  |  11 +
 .../DeliveryCompletedOutboxService.java       |  12 +-
 .../dto/PalletOperationResponses.java         |  24 +-
 .../gateway/HttpPalletPhysicalGateway.java    |  13 +-
 .../gateway/PalletPhysicalGateway.java        |   6 +
 .../service/PdaPalletOperationService.java    | 177 +++++++-
 .../pda/controller/PdaRelabelController.java  |  16 +
 .../relabel/pda/dto/PdaRelabelRequests.java   |  10 +
 .../relabel/pda/dto/PdaRelabelResponses.java  |   2 +-
 .../pda/entity/PdaRelabelUnitFact.java        |   1 +
 .../gateway/HttpRelabelPhotoFileGateway.java  |  12 +
 .../pda/gateway/RelabelPhotoFileGateway.java  |   1 +
 .../pda/service/PdaRelabelService.java        | 112 ++++-
 .../service/RelabelApplicationService.java    |  85 +++-
 .../relabel/service/RelabelBindingGuard.java  |  12 +-
 .../PdaReturnReceiptController.java           |  68 +++
 .../PlatformReturnOrderController.java        |  22 +
 .../dto/PdaReturnReceiptRequests.java         |   5 +-
 .../dto/PdaReturnReceiptResponses.java        |   7 +-
 .../dto/ReturnOrderRequests.java              |  11 +-
 .../dto/ReturnOrderResponses.java             |  11 +-
 .../entity/ReturnInventoryCarton.java         |   1 +
 .../returnreceipt/entity/ReturnOrder.java     |   2 +
 .../returnreceipt/entity/ReturnReceipt.java   |   1 +
 .../mapper/ReturnInventoryCartonMapper.java   |  17 +
 .../mapper/ReturnReceiptItemMapper.java       |   8 +-
 .../service/ReturnInventoryService.java       |   4 +
 .../service/ReturnReceiptService.java         | 251 +++++++++--
 .../service/FbaWarehouseValidator.java        |   6 +-
 .../service/WarehouseTransferService.java     |  10 +-
 .../src/main/resources/db/lastleg.sql         |  18 +-
 .../DeliveryCompletedOutboxServiceTest.java   |  34 ++
 ...PalletOperationControllerContractTest.java |  20 +
 .../HttpPalletPhysicalGatewayTest.java        |  20 +
 .../PdaPalletOperationServiceTest.java        |  67 ++-
 .../lastleg/relabel/RelabelContractTest.java  |  16 +
 .../pda/service/PdaRelabelServiceTest.java    |  67 +++
 .../RelabelApplicationServiceTest.java        |  12 +
 .../RelabelReturnCartonCandidateTest.java     |   1 +
 .../service/ReturnReceiptServiceTest.java     | 111 ++++-
 .../service/FbaWarehouseValidatorTest.java    |  12 +
 .../service/WarehouseTransferServiceTest.java |  38 ++
 scripts/README.md                             |   5 +
 ...dev-lastleg-relabel-return-incremental.sql |   4 +-
 scripts/db/incremental.sql                    |   4 +-
 scripts/db/outbound-return.sql                |   4 +-
 .../db/return-bulk-relabel-incremental.sql    |  45 ++
 .../warehouse-transfer-receipt-acceptance.mjs | 212 ++++++++++
 ...arehouse-transfer-remaining-acceptance.mjs | 393 ++++++++++++++++++
 .../warehouse-transfer-resume-acceptance.mjs  | 182 ++++++++
 .../InternalWarehousePalletController.java    |   2 +-
 .../warehouse/dto/RelabelPalletRequests.java  |   3 +-
 .../service/WarehouseResourceService.java     |  22 +-
 56 files changed, 2121 insertions(+), 111 deletions(-)
 create mode 100644 lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PlatformReturnOrderController.java
 create mode 100644 scripts/db/return-bulk-relabel-incremental.sql
 create mode 100644 scripts/warehouse-transfer-receipt-acceptance.mjs
 create mode 100644 scripts/warehouse-transfer-remaining-acceptance.mjs
 create mode 100644 scripts/warehouse-transfer-resume-acceptance.mjs

diff --git a/auth/src/main/resources/application-dev.yml b/auth/src/main/resources/application-dev.yml
index 8174995ba..1c0753a99 100644
--- a/auth/src/main/resources/application-dev.yml
+++ b/auth/src/main/resources/application-dev.yml
@@ -1,4 +1,8 @@
 spring:
+  cloud:
+    nacos:
+      discovery:
+        ip: ${NACOS_DISCOVERY_IP:127.0.0.1}
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: ${AUTH_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_auth?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true}
diff --git a/deploy/sql/海外区域统一增量-MySQL8.sql b/deploy/sql/海外区域统一增量-MySQL8.sql
index 03d53351d..82bf8d971 100644
--- a/deploy/sql/海外区域统一增量-MySQL8.sql
+++ b/deploy/sql/海外区域统一增量-MySQL8.sql
@@ -2314,6 +2314,7 @@ CREATE TABLE ll_relabel_pda_unit_fact (
   result varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '逐件结果：RELABELLED、SKIPPED或EXCEPTION',
   exception_code varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '异常编码',
   reason varchar(1000) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '跳过或异常原因',
+  quantity int NOT NULL DEFAULT '1' COMMENT '本次事实处理件数，箱级作业固定为1',
   operator_key varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '操作账号标识',
   operator_name varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '操作员名称快照',
   occurred_at datetime(3) NOT NULL COMMENT '逐件事实发生时间',
@@ -2360,6 +2361,7 @@ CREATE TABLE ll_return_inventory_carton (
   source_receipt_id bigint DEFAULT NULL COMMENT '来源PDA签收单ID',
   source_batch_no text COLLATE utf8mb4_unicode_ci COMMENT '实际消耗来源签收批次号，多个批次逗号分隔',
   source_return_no text COLLATE utf8mb4_unicode_ci COMMENT '实际消耗来源退货单号，多个单号逗号分隔',
+  pallet_code varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '签收时绑定的托盘码',
   carton_mark varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '退货箱号和箱唛编码',
   fba_carton_mark varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'FBA箱唛',
   destination_warehouse_code varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '目的仓编码',
@@ -2382,8 +2384,8 @@ CREATE TABLE ll_return_inventory_carton (
   UNIQUE KEY uk_ll_return_inventory_carton_mark (carton_mark),
   UNIQUE KEY uk_ll_return_inventory_carton_receipt (source_receipt_id),
   KEY idx_ll_return_inventory_carton_customer (customer_id,overseas_warehouse_id,status,created_at),
-  CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK ((((status in (_utf8mb4'AVAILABLE',_utf8mb4'OUTBOUNDED')) and (sku_types > 0) and (total_quantity > 0)) or ((status = _utf8mb4'MERGED') and (sku_types = 0) and (total_quantity = 0)))),
-  CONSTRAINT chk_ll_return_inventory_carton_status CHECK ((status in (_utf8mb4'AVAILABLE',_utf8mb4'MERGED',_utf8mb4'OUTBOUNDED')))
+  CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK ((((status in (_utf8mb4'AVAILABLE',_utf8mb4'RELABEL_PENDING',_utf8mb4'OUTBOUNDED')) and (sku_types > 0) and (total_quantity > 0)) or ((status = _utf8mb4'MERGED') and (sku_types = 0) and (total_quantity = 0)))),
+  CONSTRAINT chk_ll_return_inventory_carton_status CHECK ((status in (_utf8mb4'AVAILABLE',_utf8mb4'RELABEL_PENDING',_utf8mb4'MERGED',_utf8mb4'OUTBOUNDED')))
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='退货实物库存箱及箱唛';
 
 CREATE TABLE ll_return_inventory_carton_item (
@@ -2432,6 +2434,8 @@ CREATE TABLE ll_return_order (
   expected_quantity bigint NOT NULL COMMENT '预报总数量',
   received_quantity bigint NOT NULL DEFAULT '0' COMMENT '累计实收总数量',
   remark varchar(1000) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '客户备注',
+  discrepancy_reason varchar(500) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '手动完结差异原因',
+  manually_completed_at datetime(3) DEFAULT NULL COMMENT '手动差异完结时间',
   idempotency_key varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '创建幂等键',
   request_hash char(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '创建请求SHA-256',
   created_by varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建操作人ID',
@@ -2466,6 +2470,7 @@ CREATE TABLE ll_return_receipt (
   customer_id varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户ID和隔离键',
   receipt_no varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '签收单号',
   receipt_batch_no varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '签收批次号',
+  pallet_code varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '本次签收绑定的托盘码',
   carton_mark varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '签收生成或绑定的退货箱号',
   tracking_no varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '本次签收包裹的可选快递单号',
   bound_by varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '开始签收方式，RETURN_NO退货单号或SKU候选',
diff --git a/file/src/main/java/com/baiyue/file/controller/InternalBusinessFileController.java b/file/src/main/java/com/baiyue/file/controller/InternalBusinessFileController.java
index 64cac7d87..2e1e1b5bd 100644
--- a/file/src/main/java/com/baiyue/file/controller/InternalBusinessFileController.java
+++ b/file/src/main/java/com/baiyue/file/controller/InternalBusinessFileController.java
@@ -44,6 +44,15 @@ public class InternalBusinessFileController {
         return ApiResponse.success(service.upload(tenantId, businessType, businessId, operatorId, file));
     }
 
+    @GetMapping("/{tenantId}/{businessType}/{businessId}")
+    public ApiResponse<java.util.List<InternalBusinessFileService.Metadata>> list(
+        @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
+        @PathVariable long tenantId, @PathVariable @NotBlank String businessType,
+        @PathVariable @NotBlank String businessId) {
+        check(token); checkTenantId(tenantId);
+        return ApiResponse.success(service.list(tenantId, businessType, businessId));
+    }
+
     @GetMapping("/{tenantId}/{businessType}/{businessId}/{fileId}")
     public ApiResponse<InternalBusinessFileService.Metadata> metadata(
         @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
diff --git a/file/src/main/java/com/baiyue/file/service/InternalBusinessFileService.java b/file/src/main/java/com/baiyue/file/service/InternalBusinessFileService.java
index b82ed4fd8..2bc77a24b 100644
--- a/file/src/main/java/com/baiyue/file/service/InternalBusinessFileService.java
+++ b/file/src/main/java/com/baiyue/file/service/InternalBusinessFileService.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
+import java.util.List;
 @Service
 public class InternalBusinessFileService {
     @Resource private FileObjectMapper files;
@@ -52,6 +53,16 @@ public class InternalBusinessFileService {
         return metadata(required(tenantId, businessType, businessId, fileId));
     }
 
+    public List<Metadata> list(long tenantId, String businessType, String businessId) {
+        BusinessFileCategory category = BusinessFileCategory.require(businessType);
+        category.validateOwner(tenantId); category.storageBusinessId(businessId);
+        return files.selectList(new LambdaQueryWrapper<FileObjectEntity>()
+            .eq(FileObjectEntity::getTenantId, tenantId).eq(FileObjectEntity::getBusinessType, businessType)
+            .eq(FileObjectEntity::getBusinessId, businessId).eq(FileObjectEntity::getStatus, "ACTIVE")
+            .eq(FileObjectEntity::getDeleted, false).orderByAsc(FileObjectEntity::getCreatedAt, FileObjectEntity::getId))
+            .stream().map(InternalBusinessFileService::metadata).toList();
+    }
+
     public Download download(long tenantId, String businessType, String businessId, long fileId) {
         FileObjectEntity value = required(tenantId, businessType, businessId, fileId);
         return new Download(value.getOriginalName(), value.getContentType(), storage.read(value.getObjectKey()));
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxService.java
index 0b4a089f4..2fc682315 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxService.java
@@ -39,7 +39,17 @@ public class DeliveryCompletedOutboxService {
         Objects.requireNonNull(completedAt, "completedAt");
         Map<String, LastlegOrder> bySourceInbound = new LinkedHashMap<>();
         for (LastlegOrder order : orders == null ? List.<LastlegOrder>of() : orders) {
-            if ("RELABEL_APPLICATION".equals(order.getOrderType())) continue;
+            // Only orders projected from the domestic first-leg domain need an
+            // acknowledgement event. Customer/local overseas orders can still carry
+            // a local sourceInboundId, but deliberately have no domestic sourceOrderId.
+            if (StringUtils.hasText(order.getSourceRegion())
+                && !RegionCode.CN.name().equalsIgnoreCase(order.getSourceRegion())) continue;
+            // Relabel and warehouse-transfer deliveries are created and completed wholly
+            // in the overseas last-leg domain. They do not have a domestic source order
+            // to acknowledge, so publishing the cross-region event would make receipt
+            // completion fail on the missing source-order fields.
+            if ("RELABEL_APPLICATION".equals(order.getOrderType())
+                || "WAREHOUSE_TRANSFER".equals(order.getOrderType())) continue;
             if (!StringUtils.hasText(order.getSourceInboundId())) continue;
             requireText(order.getSourceOrderId(), "sourceOrderId");
             requireText(order.getInboundCode(), "inboundCode");
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/dto/PalletOperationResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/dto/PalletOperationResponses.java
index 1017dd630..0eb4cf9ec 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/dto/PalletOperationResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/dto/PalletOperationResponses.java
@@ -1,24 +1,36 @@
 package com.baiyue.lastleg.palletops.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import java.time.LocalDateTime;
 import java.util.List;
 
 public final class PalletOperationResponses {
     private PalletOperationResponses() { }
-    public record RelabelSource(long positionId, long positionVersion, String palletCode,
+    public record RelabelSource(
+                                @JsonSerialize(using = ToStringSerializer.class) long positionId,
+                                long positionVersion,
+                                @JsonSerialize(using = ToStringSerializer.class) long palletId, String palletCode,
                                 String locationCode, String inboundCode, long stockPackages,
                                 long movablePackages, List<String> cartonMarks) { }
 
-    public record InventoryLine(String customerId, String customerName, long balanceId, long positionId,
+    public record InventoryLine(String customerId, String customerName,
+                                @JsonSerialize(using = ToStringSerializer.class) long balanceId,
+                                @JsonSerialize(using = ToStringSerializer.class) long positionId,
                                 String inboundCode, String skuCode, String productName,
                                 long availablePackages, long holdPackages, long allocatedPackages,
                                 long pickedPackages, long receivingPackages, long positionVersion) { }
-    public record PalletContent(long palletId, String palletCode, String status, int palletVersion,
-                                Long locationId, String locationCode, String destinationWarehouseCode,
+    public record PalletContent(@JsonSerialize(using = ToStringSerializer.class) long palletId,
+                                String palletCode, String status, int palletVersion,
+                                @JsonSerialize(using = ToStringSerializer.class) Long locationId,
+                                String locationCode, String destinationWarehouseCode,
                                 long totalPackages, List<InventoryLine> inventory) { }
-    public record PrintablePallet(long palletId, String palletCode, int palletVersion,
+    public record PrintablePallet(@JsonSerialize(using = ToStringSerializer.class) long palletId,
+                                  String palletCode, int palletVersion,
                                   String relabelNo, String printableHtml) { }
-    public record Operation(long operationId, String operationType, String idempotencyKey,
+    public record Operation(@JsonSerialize(using = ToStringSerializer.class) long operationId,
+                            String operationType, String idempotencyKey,
                             String status, boolean replayed, LocalDateTime completedAt,
                             List<PalletContent> pallets) {
         public Operation asReplay() {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGateway.java b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGateway.java
index 3ff6e36f3..0a3472298 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGateway.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGateway.java
@@ -2,6 +2,7 @@ package com.baiyue.lastleg.palletops.gateway;
 
 import com.baiyue.lastleg.config.LastlegRestClientFactory;
 import com.baiyue.lastleg.config.LastlegRestClientProperties;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,7 +31,14 @@ public class HttpPalletPhysicalGateway implements PalletPhysicalGateway {
 
     @Override
     public PalletReference ensureRelabelPallet(long warehouseId, String businessId) {
-        Map<String, Object> body = Map.of("warehouseId", warehouseId, "businessId", businessId);
+        return ensureRelabelPallet(warehouseId, businessId, null);
+    }
+
+    @Override
+    public PalletReference ensureRelabelPallet(long warehouseId, String businessId, String fbaWarehouseCode) {
+        Map<String, Object> body = new LinkedHashMap<>();
+        body.put("warehouseId", warehouseId); body.put("businessId", businessId);
+        if (fbaWarehouseCode != null && !fbaWarehouseCode.isBlank()) body.put("fbaWarehouseCode", fbaWarehouseCode.trim());
         ResolveEnvelope response = client.post().uri("/internal/v1/warehouse-pallets/ensure-relabel")
             .header("X-Internal-Service-Token", internalToken).body(body).retrieve()
             .onStatus(HttpStatusCode::isError, (request, result) -> {
@@ -117,7 +125,10 @@ public class HttpPalletPhysicalGateway implements PalletPhysicalGateway {
             }).toBodilessEntity();
     }
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     private record ResolveEnvelope(String code, String message, PalletReference data) { }
+    @JsonIgnoreProperties(ignoreUnknown = true)
     private record LocationEnvelope(LocationReference data) { }
+    @JsonIgnoreProperties(ignoreUnknown = true)
     private record TransitionEnvelope(Transition data) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/PalletPhysicalGateway.java b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/PalletPhysicalGateway.java
index 9ef546a51..8e98a4ae6 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/PalletPhysicalGateway.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/gateway/PalletPhysicalGateway.java
@@ -1,7 +1,12 @@
 package com.baiyue.lastleg.palletops.gateway;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 public interface PalletPhysicalGateway {
     PalletReference ensureRelabelPallet(long warehouseId, String businessId);
+    default PalletReference ensureRelabelPallet(long warehouseId, String businessId, String fbaWarehouseCode) {
+        return ensureRelabelPallet(warehouseId, businessId);
+    }
     PalletReference resolve(String palletCode);
     PalletReference resolve(long palletId);
     LocationReference resolveLocation(long warehouseId, long locationId);
@@ -9,6 +14,7 @@ public interface PalletPhysicalGateway {
                      String operationKey, String reason);
     void compensate(long warehouseId, Transition transition);
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     record PalletReference(long palletId, String palletCode, long warehouseId, Long locationId,
                            String status, String fbaWarehouseCode, java.math.BigDecimal unitPrice, int version) {
         public PalletReference(long palletId, String palletCode, long warehouseId, Long locationId,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
index ccbe09d05..637626f9b 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
@@ -18,6 +18,11 @@ import com.baiyue.lastleg.relabel.entity.RelabelItem;
 import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
 import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
 import com.baiyue.lastleg.relabel.service.RelabelPalletMutationService;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryBalanceMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
 import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
 import com.baiyue.lastleg.pda.warehouse.service.PdaWarehouseService;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -48,6 +53,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 public class PdaPalletOperationService {
@@ -61,6 +67,9 @@ public class PdaPalletOperationService {
     @Resource private RelabelApplicationMapper relabelApplications;
     @Resource private RelabelItemMapper relabelItems;
     @Resource private RelabelPalletMutationService relabelPalletMutations;
+    @Resource private ReturnInventoryCartonMapper returnCartons;
+    @Resource private ReturnInventoryCartonItemMapper returnCartonItems;
+    @Resource private ReturnInventoryBalanceMapper returnBalances;
     private TransactionTemplate transaction;
     private TransactionTemplate newTransaction;
 
@@ -85,6 +94,26 @@ public class PdaPalletOperationService {
         Set<String> boundMarks = boundRelabelMarks(app);
         List<RelabelItem> items = relabelItems.selectList(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<RelabelItem>()
             .eq("application_id", app.getId()).eq("customer_id", app.getCustomerId()));
+        if (!items.isEmpty() && items.stream().allMatch(item -> item.getReturnCartonId() != null)) {
+            List<PalletOperationResponses.RelabelSource> result = new ArrayList<>();
+            Map<Long, List<RelabelItem>> byCarton = items.stream().filter(item -> !boundMarks.contains(item.getCartonMark())).collect(Collectors.groupingBy(
+                RelabelItem::getReturnCartonId, LinkedHashMap::new, Collectors.toList()));
+            for (var entry : byCarton.entrySet()) {
+                ReturnInventoryCarton carton = returnCartons.selectById(entry.getKey());
+                if (carton == null || !Objects.equals(carton.getCustomerId(), app.getCustomerId())
+                    || !Objects.equals(carton.getOverseasWarehouseId(), app.getOverseasWarehouseId())
+                    || !Objects.equals(carton.getStatus(), "RELABEL_PENDING"))
+                    throw conflict("退货换标来源托盘不存在或已被占用");
+                PalletPhysicalGateway.PalletReference pallet = physical.resolve(carton.getPalletCode());
+                if (pallet == null || pallet.warehouseId() != identity.overseasWarehouseId())
+                    throw conflict("退货换标来源托盘不属于当前仓库");
+                long quantity = value(carton.getTotalQuantity());
+                result.add(new PalletOperationResponses.RelabelSource(carton.getId(), 0L,
+                    pallet.palletId(), pallet.palletCode(), null, carton.getSourceBatchNo(), quantity, quantity,
+                    entry.getValue().stream().map(RelabelItem::getCartonMark).filter(Objects::nonNull).toList()));
+            }
+            return result;
+        }
         Map<Long, List<RelabelItem>> byBalance = new LinkedHashMap<>();
         for (RelabelItem item : items) {
             InventoryPosition anchor = positions.selectById(item.getSourceInventoryPositionId());
@@ -99,7 +128,7 @@ public class PdaPalletOperationService {
                 long ownHold = group.stream().filter(item -> Objects.equals(item.getSourceInventoryPositionId(), row.getPositionId()))
                     .mapToLong(item -> value(item.getNotifiedPackageCount())).sum();
                 result.add(new PalletOperationResponses.RelabelSource(row.getPositionId(), value(row.getVersion()),
-                    row.getPalletNo(), row.getWarehouseLocationCode(), row.getInboundCode(),
+                    row.getPalletId(), row.getPalletNo(), row.getWarehouseLocationCode(), row.getInboundCode(),
                     value(row.getAvailablePackages()) + value(row.getHoldPackages()) + value(row.getAllocatedPackages())
                         + value(row.getPickedPackages()),
                     value(row.getAvailablePackages()) + Math.min(ownHold, value(row.getHoldPackages())),
@@ -118,15 +147,22 @@ public class PdaPalletOperationService {
             throw conflict("换标单不属于 Token 冻结的海外仓");
         }
         String key = required(request.idempotencyKey(), "幂等键不能为空");
+        String destination = relabelItems.selectList(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<RelabelItem>()
+                .eq("application_id", application.getId()).eq("customer_id", application.getCustomerId()))
+            .stream().map(RelabelItem::getDestinationFbaWarehouseCode).filter(value -> value != null && !value.isBlank())
+            .distinct().reduce((left, right) -> { throw conflict("同一换标单只能绑定一个 FBA 目的仓"); }).orElse(null);
         PalletPhysicalGateway.PalletReference pallet = physical.ensureRelabelPallet(identity.overseasWarehouseId(),
-            relabelNo + ":" + key);
+            relabelNo + ":" + key, destination);
         String code = HtmlUtils.htmlEscape(pallet.palletCode());
         String order = HtmlUtils.htmlEscape(relabelNo);
+        String fbaValue = destination == null ? pallet.fbaWarehouseCode() : destination;
+        String fba = HtmlUtils.htmlEscape(fbaValue == null ? "" : fbaValue);
+        if (fba == null || fba.isBlank()) fba = "待绑定";
         String html = "<!doctype html><html><head><meta charset=\"UTF-8\"><title>" + code
             + "</title><style>@page{size:100mm 70mm;margin:4mm}body{font-family:Arial,sans-serif;text-align:center;margin:0}"
             + "h1{font-size:24px;margin:8mm 0 4mm;letter-spacing:0}.code{font-size:18px;font-weight:700;word-break:break-all}"
             + ".ref{font-size:12px;margin-top:6mm}</style></head><body><h1>托盘标签</h1><div class=\"code\">"
-            + code + "</div><div class=\"ref\">换标单：" + order + "</div></body></html>";
+            + code + "</div><div class=\"ref\">换标单：" + order + "<br>FBA目的仓：" + fba + "</div></body></html>";
         return new PalletOperationResponses.PrintablePallet(pallet.palletId(), pallet.palletCode(), pallet.version(),
             relabelNo, html);
     }
@@ -205,8 +241,10 @@ public class PdaPalletOperationService {
         Map<Long, Long> packagesByPosition = new LinkedHashMap<>();
         Map<Long, List<RelabelItem>> itemsByPosition = new LinkedHashMap<>();
         Map<Long, InventoryPosition> anchors = new LinkedHashMap<>();
-        InventoryPosition actual = request.actualSource() == null ? null : positions.selectById(request.actualSource().positionId());
-        if (request.actualSource() != null && (actual == null
+        boolean returnRelabel = selected.stream().allMatch(item -> item.getReturnCartonId() != null);
+        InventoryPosition actual = returnRelabel || request.actualSource() == null
+            ? null : positions.selectById(request.actualSource().positionId());
+        if (!returnRelabel && request.actualSource() != null && (actual == null
             || !Objects.equals(actual.getCustomerId(), application.getCustomerId())
             || !Objects.equals(actual.getPalletId(), source.palletId())
             || !Objects.equals(actual.getOverseasWarehouseId(), application.getOverseasWarehouseId())
@@ -219,13 +257,17 @@ public class PdaPalletOperationService {
         if ("PROCESSING".equals(application.getStatus())) {
             var workTask = relabelWorkTasks.find(application.getCustomerId(), application.getId());
             for (RelabelItem item : selected) {
-                Long completed = relabelWorkFacts.selectCount(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<com.baiyue.lastleg.relabel.pda.entity.PdaRelabelUnitFact>()
-                    .eq("task_id", workTask.getId()).eq("customer_id", application.getCustomerId())
-                    .eq("item_id", item.getId()).eq("result", "RELABELLED"));
-                if (completed == null || completed < value(item.getNotifiedPackageCount()))
+                long completed = relabelWorkFacts.selectList(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<com.baiyue.lastleg.relabel.pda.entity.PdaRelabelUnitFact>()
+                        .eq("task_id", workTask.getId()).eq("customer_id", application.getCustomerId())
+                        .eq("item_id", item.getId()).eq("result", "RELABELLED"))
+                    .stream().mapToLong(fact -> fact.getQuantity() == null ? 1L : fact.getQuantity()).sum();
+                if (completed < value(item.getNotifiedPackageCount()))
                     throw conflict("请先完成本箱全部换标作业，再进行组托");
             }
         }
+        if (returnRelabel) {
+            return bindReturnRelabelPallet(identity, application, selected, source, target, request);
+        }
         for (RelabelItem item : selected) {
             if (item.getSourceInventoryPositionId() == null || item.getNotifiedPackageCount() == null
                 || item.getNotifiedPackageCount() <= 0) throw conflict("换标箱唛缺少库存位置或箱数快照");
@@ -265,6 +307,107 @@ public class PdaPalletOperationService {
             reason, relabelPlan);
     }
 
+    private PalletOperationResponses.Operation bindReturnRelabelPallet(PdaWarehouseIdentity identity,
+        RelabelApplication application, List<RelabelItem> selected,
+        PalletPhysicalGateway.PalletReference source, PalletPhysicalGateway.PalletReference target,
+        PalletOperationRequests.RelabelDisassemble request) {
+        requireRelabelDestination(identity.overseasWarehouseId(), selected, target);
+        Set<String> alreadyBound = boundRelabelMarks(application);
+        if (selected.stream().map(RelabelItem::getCartonMark).anyMatch(alreadyBound::contains))
+            throw conflict("退货换标箱已在本轮完成组托，请刷新后重试");
+        long quantity = 0;
+        List<ReturnInventoryCarton> cartons = new ArrayList<>();
+        for (RelabelItem item : selected) {
+            ReturnInventoryCarton carton = returnCartons.lockId(item.getReturnCartonId());
+            if (carton == null || !Objects.equals(carton.getCustomerId(), application.getCustomerId())
+                || !Objects.equals(carton.getPalletCode(), source.palletCode())
+                || !Objects.equals(carton.getRelabelApplicationId(), application.getId())
+                || !Objects.equals(carton.getStatus(), "RELABEL_PENDING"))
+                throw conflict("退货换标来源托盘或库存状态已变化，请刷新后重试");
+            quantity += value(item.getNotifiedPackageCount());
+            cartons.add(carton);
+        }
+        if (request.actualSource() == null || request.actualSource().positionId() != cartons.get(0).getId()
+            || request.actualSource().packages() != quantity)
+            throw conflict("退货换标拆出数量必须等于本批已完成贴标数量");
+        String key = required(request.idempotencyKey(), "幂等键不能为空");
+        String requestHash = hash(request);
+        PdaPalletOperation operation = begin(identity, "RELABEL_PALLET_DISASSEMBLE", key, requestHash);
+        if ("COMPLETED".equals(operation.getStatus())) return read(operation).asReplay();
+        physical.apply(identity.overseasWarehouseId(), target, "OCCUPIED", target.locationId(), key, "退货换标组托");
+        return transaction.execute(status -> {
+            for (int index = 0; index < cartons.size(); index++) {
+                RelabelItem item = selected.get(index);
+                ReturnInventoryCarton carton = returnCartons.lockId(item.getReturnCartonId());
+                if (carton == null || !Objects.equals(carton.getCustomerId(), application.getCustomerId())
+                    || !Objects.equals(carton.getPalletCode(), source.palletCode())
+                    || !Objects.equals(carton.getRelabelApplicationId(), application.getId())
+                    || !"RELABEL_PENDING".equals(carton.getStatus()))
+                    throw conflict("退货换标来源库存已变化，请刷新后重试");
+                long move = value(item.getNotifiedPackageCount());
+                if (move <= 0 || move > value(carton.getTotalQuantity())) throw conflict("来源托盘可拆数量不足");
+                if (move < value(carton.getTotalQuantity())) {
+                    splitReturnRelabelCarton(application, item, carton, target, move);
+                } else {
+                    carton.setPalletCode(target.palletCode());
+                    carton.setDestinationWarehouseCode(item.getDestinationFbaWarehouseCode());
+                    carton.setRelabelStatus("PROCESSING");
+                    carton.setUpdatedAt(LocalDateTime.now());
+                    returnCartons.updateById(carton);
+                }
+            }
+            recordReturnRelabelBinding(identity, application, selected, target.palletCode());
+            List<PalletOperationResponses.PalletContent> contents = List.of(
+                content(identity.overseasWarehouseId(), physical.resolve(source.palletCode())),
+                content(identity.overseasWarehouseId(), physical.resolve(target.palletCode())));
+            PalletOperationResponses.Operation result = new PalletOperationResponses.Operation(operation.getId(),
+                operation.getOperationType(), key, "COMPLETED", false, LocalDateTime.now(), contents);
+            operation.setStatus("COMPLETED"); operation.setResultJson(write(result));
+            operation.setUpdatedAt(result.completedAt()); mapper.updateById(operation);
+            return result;
+        });
+    }
+
+    /** Keep the unlabelled remainder on its original pallet; move only the confirmed SKU pieces. */
+    private void splitReturnRelabelCarton(RelabelApplication application, RelabelItem item,
+        ReturnInventoryCarton source, PalletPhysicalGateway.PalletReference target, long quantity) {
+        if (relabelItems.selectList(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<RelabelItem>()
+            .eq("application_id", application.getId()).eq("return_carton_id", source.getId())).size() != 1)
+            throw conflict("来源托盘包含多项换标任务，不能按单 SKU 拆分，请核对库存");
+        List<ReturnInventoryCartonItem> lines = returnCartonItems.lockCarton(source.getId());
+        if (lines.size() != 1 || !item.getSkuCode().equalsIgnoreCase(lines.get(0).getSkuCode())
+            || value(lines.get(0).getQuantity()) != value(source.getTotalQuantity()))
+            throw conflict("来源托盘包含其他 SKU，不能按单 SKU 拆分，请核对库存");
+        long remaining = value(source.getTotalQuantity()) - quantity;
+        ReturnInventoryCartonItem sourceLine = lines.get(0);
+        sourceLine.setQuantity(remaining);
+        if (returnCartonItems.updateById(sourceLine) != 1
+            || returnCartons.releasePartial(source.getId(), application.getCustomerId(), application.getId(), remaining) != 1)
+            throw conflict("来源托盘数量已变化，请刷新后重试");
+        LocalDateTime now = LocalDateTime.now();
+        long targetId = IdWorker.getId();
+        ReturnInventoryCarton moved = new ReturnInventoryCarton();
+        moved.setId(targetId); moved.setCustomerId(source.getCustomerId());
+        moved.setOverseasWarehouseId(source.getOverseasWarehouseId());
+        moved.setSourceBatchNo(source.getSourceBatchNo()); moved.setSourceReturnNo(source.getSourceReturnNo());
+        moved.setPalletCode(target.palletCode()); moved.setCartonMark("RL-CARTON-" + targetId);
+        moved.setDestinationWarehouseCode(item.getDestinationFbaWarehouseCode());
+        moved.setRelabelApplicationId(application.getId()); moved.setRelabelNo(application.getRelabelNo());
+        moved.setRelabelStatus("PROCESSING"); moved.setStatus("RELABEL_PENDING");
+        moved.setSkuTypes(1); moved.setTotalQuantity(quantity);
+        moved.setCreatedAt(now); moved.setUpdatedAt(now);
+        if (returnCartons.insert(moved) != 1) throw conflict("新托盘库存创建失败");
+        ReturnInventoryCartonItem targetLine = new ReturnInventoryCartonItem();
+        targetLine.setId(IdWorker.getId()); targetLine.setCartonId(targetId);
+        targetLine.setCustomerId(source.getCustomerId()); targetLine.setSkuCode(sourceLine.getSkuCode());
+        targetLine.setProductNameZh(sourceLine.getProductNameZh()); targetLine.setQuantity(quantity);
+        if (returnCartonItems.insert(targetLine) != 1
+            || returnBalances.adjustCartonQuantity(source.getCustomerId(), source.getOverseasWarehouseId(),
+                sourceLine.getSkuCode(), 1) != 1) throw conflict("退货库存拆分记账失败");
+        item.setReturnCartonId(targetId);
+        if (relabelItems.updateById(item) != 1) throw conflict("换标单来源托盘更新失败");
+    }
+
     public PalletOperationResponses.Operation swap(PdaWarehouseIdentity identity,
                                                     PalletOperationRequests.Swap request) {
         PalletOperationResponses.Operation replay = replayIfPresent(identity, "PALLET_SWAP",
@@ -610,6 +753,22 @@ public class PdaPalletOperationService {
         relabelWorkHistory.insert(record);
     }
 
+    private void recordReturnRelabelBinding(PdaWarehouseIdentity identity, RelabelApplication app,
+                                             List<RelabelItem> items, String targetPallet) {
+        var task = relabelWorkTasks.find(app.getCustomerId(), app.getId());
+        if (task == null) throw conflict("退货换标作业任务不存在，不能记录组托");
+        var record = new com.baiyue.lastleg.relabel.pda.entity.PdaRelabelHistory();
+        record.setId(IdWorker.getId()); record.setTaskId(task.getId()); record.setApplicationId(app.getId());
+        record.setCustomerId(app.getCustomerId()); record.setAction("PALLET_BIND");
+        record.setFromStatus(task.getStatus()); record.setToStatus(task.getStatus());
+        record.setOperatorKey(identity.operatorKey()); record.setOperatorName(identity.operatorName());
+        record.setCreatedAt(LocalDateTime.now());
+        record.setDetailJson(write(Map.of("round", Objects.toString(task.getReviewedAt(), "INITIAL"),
+            "cartonMarks", items.stream().map(RelabelItem::getCartonMark).toList(),
+            "targetPallets", List.of(targetPallet))));
+        relabelWorkHistory.insert(record);
+    }
+
     private void requireRelabelWork(PdaWarehouseIdentity identity, RelabelApplication application) {
         if (application == null || !Set.of("PROCESSING", "READY_FOR_OUTBOUND").contains(application.getStatus()))
             throw conflict("当前换标状态不能组托");
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/controller/PdaRelabelController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/controller/PdaRelabelController.java
index 34011a428..0e4405b67 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/controller/PdaRelabelController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/controller/PdaRelabelController.java
@@ -78,6 +78,22 @@ public class PdaRelabelController {
             identity.overseasWarehouseId(), relabelNo, request));
     }
 
+    @PostMapping("/{relabelNo}/return-skus/complete")
+    public ApiResponse<PdaRelabelResponses.Detail> completeReturnSku(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String relabelNo, @Valid @RequestBody PdaRelabelRequests.BulkSku request) {
+        Identity identity = identity(user);
+        return ApiResponse.success(service.completeReturnSku(identity.operatorKey(), identity.operatorName(),
+            identity.overseasWarehouseId(), relabelNo, request));
+    }
+
+    @PostMapping("/{relabelNo}/return-skus/complete-total")
+    public ApiResponse<PdaRelabelResponses.Detail> completeReturnSkuTotal(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String relabelNo, @Valid @RequestBody PdaRelabelRequests.BulkSkuTotal request) {
+        Identity identity = identity(user);
+        return ApiResponse.success(service.completeReturnSkuTotal(identity.operatorKey(), identity.operatorName(),
+            identity.overseasWarehouseId(), relabelNo, request));
+    }
+
     @GetMapping("/{relabelNo}/documents")
     public ApiResponse<List<PdaRelabelService.Document>> documents(@AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String relabelNo) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelRequests.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelRequests.java
index c28d56bbe..a44f212f0 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelRequests.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelRequests.java
@@ -37,6 +37,16 @@ public final class PdaRelabelRequests {
     public record SkuVerification(@NotBlank String skuCode, @NotBlank String newSkuCode,
                                   @Positive int quantity) { }
 
+    public record BulkSku(@NotNull @Positive Long itemId,
+                          @Positive int quantity,
+                          @NotNull @Min(0) Integer expectedVersion,
+                          @NotBlank @Size(max = 255) String idempotencyKey) { }
+
+    public record BulkSkuTotal(@NotBlank @Size(max = 255) String skuCode,
+                               @Positive int quantity,
+                               @NotNull @Min(0) Integer expectedVersion,
+                               @NotBlank @Size(max = 255) String idempotencyKey) { }
+
     public record Skip(@NotNull @Positive Long itemId,
                        @NotBlank @Size(max = 255) String oldLabel,
                        @NotBlank @Size(max = 1000) String reason,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelResponses.java
index e00d48949..dc74a0191 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/dto/PdaRelabelResponses.java
@@ -32,7 +32,7 @@ public final class PdaRelabelResponses {
 
     public record UnitFact(Long factId, Long itemId, String oldLabel, String newLabel,
                            String result, String exceptionCode, String reason,
-                           String operatorName, LocalDateTime occurredAt) { }
+                           int quantity, String operatorName, LocalDateTime occurredAt) { }
 
     public record History(String action, String fromStatus, String toStatus,
                           String operatorName, String detail, LocalDateTime createdAt) { }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/entity/PdaRelabelUnitFact.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/entity/PdaRelabelUnitFact.java
index a6ece68da..3c435e0bc 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/entity/PdaRelabelUnitFact.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/entity/PdaRelabelUnitFact.java
@@ -20,6 +20,7 @@ public class PdaRelabelUnitFact {
     private String result;
     private String exceptionCode;
     private String reason;
+    private Integer quantity;
     private String operatorKey;
     private String operatorName;
     private LocalDateTime occurredAt;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/HttpRelabelPhotoFileGateway.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/HttpRelabelPhotoFileGateway.java
index 1e53232f7..2e016f9b9 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/HttpRelabelPhotoFileGateway.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/HttpRelabelPhotoFileGateway.java
@@ -90,6 +90,17 @@ public class HttpRelabelPhotoFileGateway implements RelabelPhotoFileGateway {
         }
     }
 
+    @Override
+    public java.util.List<UploadedFile> list(String customerId, long taskId) {
+        MetadataListEnvelope response = client.get()
+            .uri("/internal/file/v1/business-files/{tenantId}/{businessType}/{businessId}", tenantId(customerId), BUSINESS_TYPE, taskId)
+            .header("X-Internal-Service-Token", internalToken).retrieve()
+            .onStatus(HttpStatusCode::isError, (request, result) -> { throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, "Relabel photo list failed"); })
+            .body(MetadataListEnvelope.class);
+        if (response == null || !"200".equals(response.code()) || response.data() == null) return java.util.List.of();
+        return response.data().stream().map(value -> new UploadedFile(value.fileId(), value.fileName(), value.contentType(), value.sizeBytes() == null ? 0L : value.sizeBytes())).toList();
+    }
+
     @Override
     public DownloadedFile download(String customerId, long taskId, long fileId) {
         validate(customerId, taskId, fileId);
@@ -130,6 +141,7 @@ public class HttpRelabelPhotoFileGateway implements RelabelPhotoFileGateway {
     }
 
     private record MetadataEnvelope(String code, String message, Metadata data) { }
+    private record MetadataListEnvelope(String code, String message, java.util.List<Metadata> data) { }
     private record Metadata(Long fileId, Long tenantId, String businessType, String businessId,
                             String fileName, String contentType, Long sizeBytes) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/RelabelPhotoFileGateway.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/RelabelPhotoFileGateway.java
index 1cccc2344..84b398f43 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/RelabelPhotoFileGateway.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/gateway/RelabelPhotoFileGateway.java
@@ -6,6 +6,7 @@ public interface RelabelPhotoFileGateway {
     UploadedFile upload(String customerId, long taskId, long operatorId, MultipartFile file);
     void validate(String customerId, long taskId, long fileId);
     DownloadedFile download(String customerId, long taskId, long fileId);
+    java.util.List<UploadedFile> list(String customerId, long taskId);
 
     record UploadedFile(long fileId, String fileName, String contentType, long sizeBytes) { }
     record DownloadedFile(byte[] content, String fileName, String contentType) { }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelService.java
index b6a15ee2e..2f783ae44 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelService.java
@@ -39,6 +39,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HexFormat;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -238,6 +239,88 @@ public class PdaRelabelService {
         return result;
     }
 
+    @Transactional
+    public PdaRelabelResponses.Detail completeReturnSku(String operatorKey, String operatorName, long warehouseId,
+                                                        String relabelNo, PdaRelabelRequests.BulkSku request) {
+        UnitCommand command = new UnitCommand(relabelNo, "RETURN_BULK_SKU", request);
+        PdaRelabelResponses.Detail replay = replay(operatorKey, warehouseId, relabelNo, "RETURN_BULK_SKU",
+            request.idempotencyKey(), command);
+        if (replay != null) return replay;
+        RelabelApplication application = requireApplication(relabelNo, warehouseId, true);
+        PdaRelabelTask task = requireOwnedTask(application, operatorKey, true);
+        requireVersion(task, request.expectedVersion());
+        RelabelItem item = requireItem(application, request.itemId());
+        if (!"RETURN_BULK_SKU_LABEL".equals(operationType(item))) throw conflict("当前明细不是退货按件贴标任务");
+        int completed = quantity(factList(task).stream().filter(fact -> item.getId().equals(fact.getItemId())).toList(), "RELABELLED");
+        int remaining = value(item.getNotifiedPackageCount()) - completed;
+        if (request.quantity() > remaining) throw conflict("本次完成数量超过该 SKU 剩余贴标数量");
+        PdaRelabelUnitFact fact = new PdaRelabelUnitFact();
+        fact.setId(IdWorker.getId()); fact.setTaskId(task.getId()); fact.setApplicationId(application.getId());
+        // A bulk SKU is shared by many units/pallets; old_label is uniquely indexed for physical carton scans.
+        fact.setItemId(item.getId()); fact.setCustomerId(application.getCustomerId());
+        fact.setResult("RELABELLED"); fact.setQuantity(request.quantity()); fact.setOperatorKey(operatorKey);
+        fact.setOperatorName(operatorName); fact.setOccurredAt(LocalDateTime.now()); unitFacts.insert(fact);
+        task.setRelabelledPackages(value(task.getRelabelledPackages()) + request.quantity());
+        updateTask(task, request.expectedVersion());
+        insertHistory(task, "RETURN_BULK_SKU", PROCESSING, PROCESSING, operatorKey, operatorName,
+            Map.of("factId", fact.getId(), "itemId", item.getId(), "skuCode", item.getSkuCode(), "quantity", request.quantity()));
+        PdaRelabelResponses.Detail result = detail(application, task);
+        saveOperation(task, operatorKey, "RETURN_BULK_SKU", request.idempotencyKey(), command, result);
+        return result;
+    }
+
+    @Transactional
+    public PdaRelabelResponses.Detail completeReturnSkuTotal(String operatorKey, String operatorName, long warehouseId,
+                                                             String relabelNo, PdaRelabelRequests.BulkSkuTotal request) {
+        UnitCommand command = new UnitCommand(relabelNo, "RETURN_BULK_SKU_TOTAL", request);
+        PdaRelabelResponses.Detail replay = replay(operatorKey, warehouseId, relabelNo, "RETURN_BULK_SKU_TOTAL",
+            request.idempotencyKey(), command);
+        if (replay != null) return replay;
+        RelabelApplication application = requireApplication(relabelNo, warehouseId, true);
+        PdaRelabelTask task = requireOwnedTask(application, operatorKey, true);
+        requireVersion(task, request.expectedVersion());
+        String skuCode = request.skuCode().trim();
+        List<RelabelItem> skuItems = itemList(application).stream()
+            .filter(item -> "RETURN_BULK_SKU_LABEL".equals(operationType(item)))
+            .filter(item -> skuCode.equalsIgnoreCase(Objects.toString(item.getSkuCode(), "").trim()))
+            .toList();
+        if (skuItems.isEmpty()) throw notFound("当前换标单没有该退货 SKU");
+        List<PdaRelabelUnitFact> existingFacts = factList(task);
+        Map<Long, Integer> completedByItem = new HashMap<>();
+        for (RelabelItem item : skuItems) {
+            completedByItem.put(item.getId(), quantity(existingFacts.stream()
+                .filter(fact -> item.getId().equals(fact.getItemId())).toList(), "RELABELLED"));
+        }
+        int totalRemaining = skuItems.stream().mapToInt(item -> value(item.getNotifiedPackageCount())
+            - completedByItem.getOrDefault(item.getId(), 0)).sum();
+        if (request.quantity() > totalRemaining) throw conflict("本次完成数量超过该 SKU 剩余贴标数量");
+        int remainingToAllocate = request.quantity();
+        List<Map<String, Object>> allocations = new ArrayList<>();
+        LocalDateTime occurredAt = LocalDateTime.now();
+        for (RelabelItem item : skuItems) {
+            if (remainingToAllocate == 0) break;
+            int itemRemaining = value(item.getNotifiedPackageCount()) - completedByItem.getOrDefault(item.getId(), 0);
+            int allocated = Math.min(remainingToAllocate, itemRemaining);
+            if (allocated <= 0) continue;
+            PdaRelabelUnitFact fact = new PdaRelabelUnitFact();
+            fact.setId(IdWorker.getId()); fact.setTaskId(task.getId()); fact.setApplicationId(application.getId());
+            // Do not write a shared SKU into the unique physical old-label column.
+            fact.setItemId(item.getId()); fact.setCustomerId(application.getCustomerId());
+            fact.setResult("RELABELLED"); fact.setQuantity(allocated); fact.setOperatorKey(operatorKey);
+            fact.setOperatorName(operatorName); fact.setOccurredAt(occurredAt); unitFacts.insert(fact);
+            allocations.add(Map.of("itemId", item.getId(), "cartonMark", Objects.toString(item.getCartonMark(), ""),
+                "quantity", allocated, "factId", fact.getId()));
+            remainingToAllocate -= allocated;
+        }
+        task.setRelabelledPackages(value(task.getRelabelledPackages()) + request.quantity());
+        updateTask(task, request.expectedVersion());
+        insertHistory(task, "RETURN_BULK_SKU_TOTAL", PROCESSING, PROCESSING, operatorKey, operatorName,
+            Map.of("skuCode", skuCode, "quantity", request.quantity(), "allocations", allocations));
+        PdaRelabelResponses.Detail result = detail(application, task);
+        saveOperation(task, operatorKey, "RETURN_BULK_SKU_TOTAL", request.idempotencyKey(), command, result);
+        return result;
+    }
+
     @Transactional(readOnly = true)
     public List<Document> documents(long warehouseId, String relabelNo) {
         RelabelApplication app = requireApplication(relabelNo, warehouseId, false);
@@ -311,26 +394,28 @@ public class PdaRelabelService {
         if (!request.manualCompletion()) bindingGuard.requireBound(application);
         List<RelabelItem> detailItems = itemList(application);
         List<PdaRelabelUnitFact> facts = factList(task);
-        boolean incomplete = detailItems.stream().anyMatch(item -> facts.stream()
-            .filter(fact -> item.getId().equals(fact.getItemId())).count() < value(item.getNotifiedPackageCount()));
+        boolean incomplete = detailItems.stream().anyMatch(item -> processedQuantity(facts, item.getId()) < value(item.getNotifiedPackageCount()));
         if ((incomplete || request.manualCompletion()) && !StringUtils.hasText(request.remark()))
             throw conflict("手动完成必须填写仓库异常作业备注");
         if (incomplete && !request.manualCompletion()) throw conflict("仍有未处理箱，请选择手动完成并填写作业备注");
         if (request.photoFileIds() == null || request.photoFileIds().isEmpty() || request.photoFileIds().size() > 20) throw conflict("完成换标必须上传 1 至 20 张作业照片");
         if (request.manualCompletion() && request.remark().trim().length() > 900) throw conflict("手动作业备注不能超过 900 字");
         for (RelabelItem item : detailItems) {
-            long actual = facts.stream().filter(fact -> item.getId().equals(fact.getItemId())).count();
+            long actual = processedQuantity(facts, item.getId());
             if (actual > value(item.getNotifiedPackageCount())) {
                 throw conflict("Every relabel item must have exactly one fact per notified package");
             }
-            for (long i = actual; i < value(item.getNotifiedPackageCount()); i++) {
+            long missing = value(item.getNotifiedPackageCount()) - actual;
+            int factCount = "RETURN_BULK_SKU_LABEL".equals(operationType(item)) && missing > 0 ? 1 : Math.toIntExact(missing);
+            for (int i = 0; i < factCount; i++) {
                 PdaRelabelUnitFact fact = new PdaRelabelUnitFact();
                 fact.setId(IdWorker.getId()); fact.setTaskId(task.getId()); fact.setApplicationId(application.getId());
                 fact.setItemId(item.getId()); fact.setCustomerId(application.getCustomerId());
                 fact.setResult("EXCEPTION"); fact.setExceptionCode("MANUAL_COMPLETE");
+                fact.setQuantity("RETURN_BULK_SKU_LABEL".equals(operationType(item)) ? Math.toIntExact(missing) : 1);
                 fact.setReason(request.remark()); fact.setOperatorKey(operatorKey); fact.setOperatorName(operatorName);
                 fact.setOccurredAt(LocalDateTime.now()); unitFacts.insert(fact);
-                task.setExceptionPackages(value(task.getExceptionPackages()) + 1);
+                task.setExceptionPackages(value(task.getExceptionPackages()) + fact.getQuantity());
             }
         }
         List<Long> photoIds = request.photoFileIds().stream().distinct().toList();
@@ -475,6 +560,7 @@ public class PdaRelabelService {
             resolvedNewLabel = trim(item.getFbaCartonMark());
         }
         fact.setOldLabel(normalizedOldLabel); fact.setNewLabel(resolvedNewLabel); fact.setResult(resultCode);
+        fact.setQuantity(1);
         fact.setExceptionCode(exceptionCode); fact.setReason(trim(reason));
         fact.setOperatorKey(operatorKey); fact.setOperatorName(operatorName); fact.setOccurredAt(LocalDateTime.now());
         try { unitFacts.insert(fact); }
@@ -622,15 +708,15 @@ public class PdaRelabelService {
                 item.getShipmentNo(), item.getTrackingCode(), item.getNewSkuCode(), item.getLabelRequirement(),
                 item.getRelabelFileId(), item.getRelabelFileName(), item.getRelabelFileUrl(),
                 item.getCartonMark(), item.getFbaCartonMark(), operationType(item), readSkuItems(item.getSkuRelabelItemsJson()),
-                value(item.getNotifiedPackageCount()), count(itemFacts, "RELABELLED"), count(itemFacts, "SKIPPED"),
-                count(itemFacts, "EXCEPTION"),
+                value(item.getNotifiedPackageCount()), quantity(itemFacts, "RELABELLED"), quantity(itemFacts, "SKIPPED"),
+                quantity(itemFacts, "EXCEPTION"),
                 count(itemFacts, "RELABELLED") + (itemFacts.isEmpty() && mixedStageDone(task, item.getId(), "CARTON") ? 1 : 0),
                 count(itemFacts, "RELABELLED") + (itemFacts.isEmpty() && mixedStageDone(task, item.getId(), "SKU") ? 1 : 0),
                 item.getDestinationFbaWarehouseCode());
         }).toList();
         List<PdaRelabelResponses.UnitFact> factResponses = facts.stream().map(fact ->
             new PdaRelabelResponses.UnitFact(fact.getId(), fact.getItemId(), fact.getOldLabel(), fact.getNewLabel(),
-                fact.getResult(), fact.getExceptionCode(), fact.getReason(), fact.getOperatorName(), fact.getOccurredAt())).toList();
+                fact.getResult(), fact.getExceptionCode(), fact.getReason(), factQuantity(fact), fact.getOperatorName(), fact.getOccurredAt())).toList();
         List<PdaRelabelResponses.History> historyResponses = task == null ? List.of() : histories.selectList(
             new LambdaQueryWrapper<PdaRelabelHistory>().eq(PdaRelabelHistory::getCustomerId, application.getCustomerId())
                 .eq(PdaRelabelHistory::getTaskId, task.getId())
@@ -727,6 +813,9 @@ public class PdaRelabelService {
 
     private String operationType(RelabelApplication application) {
         List<RelabelItem> items = itemList(application);
+        if (!items.isEmpty() && items.stream().allMatch(item -> "RETURN_BULK_SKU_LABEL".equals(operationType(item)))) {
+            return "RETURN_BULK_SKU_LABEL";
+        }
         boolean sku = items.stream().anyMatch(item -> Set.of("SKU_LABEL", "CARTON_AND_SKU").contains(operationType(item)));
         boolean carton = items.stream().anyMatch(item -> !"SKU_LABEL".equals(operationType(item)));
         return sku && carton ? "CARTON_AND_SKU" : sku ? "SKU_LABEL" : "CARTON_LABEL";
@@ -748,6 +837,13 @@ public class PdaRelabelService {
     private static int count(List<PdaRelabelUnitFact> facts, String result) {
         return (int) facts.stream().filter(fact -> result.equals(fact.getResult())).count();
     }
+    private static int quantity(List<PdaRelabelUnitFact> facts, String result) {
+        return facts.stream().filter(fact -> result.equals(fact.getResult())).mapToInt(PdaRelabelService::factQuantity).sum();
+    }
+    private static int processedQuantity(List<PdaRelabelUnitFact> facts, Long itemId) {
+        return facts.stream().filter(fact -> itemId.equals(fact.getItemId())).mapToInt(PdaRelabelService::factQuantity).sum();
+    }
+    private static int factQuantity(PdaRelabelUnitFact fact) { return fact.getQuantity() == null ? 1 : fact.getQuantity(); }
     private static int value(Integer value) { return value == null ? 0 : value; }
     private static String trim(String value) { return StringUtils.hasText(value) ? value.trim() : null; }
     private static String idempotencyKey(String value) { return value == null ? null : value.trim(); }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
index 0aa38d523..7869543ee 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
@@ -31,8 +31,10 @@ import com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway;
 import com.baiyue.lastleg.relabel.pda.mapper.PdaRelabelTaskMapper;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnOrder;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper;
 import com.baiyue.lastleg.delivery.entity.OutboundOrder;
 import com.baiyue.lastleg.delivery.entity.OutboundPalletItem;
 import com.baiyue.lastleg.delivery.entity.OutboundPdaTask;
@@ -70,10 +72,11 @@ import java.util.stream.Collectors;
 
 @Service
 public class RelabelApplicationService implements WalletResultHandler {
+    public static final String PENDING_REVIEW = "PENDING_REVIEW";
     public static final String PENDING_PROCESSING = "PENDING_PROCESSING";
     public static final String CUSTOMER_CONFIRM_PENDING = "CUSTOMER_CONFIRM_PENDING";
     public static final String READY_FOR_OUTBOUND = "READY_FOR_OUTBOUND";
-    private static final Set<String> STATUSES = Set.of(PENDING_PROCESSING, "PROCESSING", CUSTOMER_CONFIRM_PENDING,
+    private static final Set<String> STATUSES = Set.of(PENDING_REVIEW, PENDING_PROCESSING, "PROCESSING", CUSTOMER_CONFIRM_PENDING,
         READY_FOR_OUTBOUND, "COMPLETED", "REJECTED", "CANCELLED");
     private static final Set<String> DELIVERY_METHODS = Set.of("TRUCK", "EXPRESS", "TRUCK_PICKUP", "EXPRESS_PICKUP", "PICKUP");
 
@@ -90,6 +93,7 @@ public class RelabelApplicationService implements WalletResultHandler {
     @Resource private InventoryPositionMapper inventoryPositions;
     @Resource private ReturnInventoryCartonMapper returnCartons;
     @Resource private ReturnInventoryCartonItemMapper returnCartonItems;
+    @Resource private ReturnOrderMapper returnOrders;
     @Resource private RelabelDocumentFileGateway documentFiles;
     @Resource private PdaRelabelTaskMapper pdaTasks;
     @Resource private RelabelPhotoFileGateway photoFiles;
@@ -203,7 +207,7 @@ public class RelabelApplicationService implements WalletResultHandler {
         if (!StringUtils.hasText(customerId)) throw badRequest("客户不能为空");
         RelabelApplication application = applications.lockNo(customerId, relabelNo);
         if (application == null) throw notFound("Relabel application not found");
-        if (!Set.of(PENDING_PROCESSING, "PROCESSING").contains(application.getStatus())) throw conflict("当前换标状态不允许修改资料");
+        if (!Set.of(PENDING_REVIEW, PENDING_PROCESSING, "PROCESSING").contains(application.getStatus())) throw conflict("当前换标状态不允许修改资料");
         return application;
     }
 
@@ -270,9 +274,13 @@ public class RelabelApplicationService implements WalletResultHandler {
             if (cartonSkus.isEmpty()) continue;
             String skuCodes = cartonSkus.stream().map(RelabelResponses.SkuItem::skuCode)
                 .collect(Collectors.joining(","));
+            long availablePackages = value(carton.getTotalQuantity());
+            if (availablePackages <= 0) {
+                availablePackages = cartonSkus.stream().mapToLong(RelabelResponses.SkuItem::quantity).sum();
+            }
             result.add(new RelabelResponses.InventoryCandidate(null, null, carton.getSourceReturnNo(),
                 null, carton.getOverseasWarehouseId(), null, null, carton.getDestinationWarehouseCode(),
-                carton.getDestinationWarehouseName(), skuCodes, "退货合箱库存", 1, 0, List.of(),
+                carton.getDestinationWarehouseName(), skuCodes, "退货入库库存", availablePackages, 0, List.of(),
                 "RETURN_CARTON", carton.getId(), carton.getCartonMark(), cartonSkus));
         }
         return result;
@@ -347,6 +355,8 @@ public class RelabelApplicationService implements WalletResultHandler {
         int notified = 0;
         List<SourceInventory> sources = new java.util.ArrayList<>();
         Set<String> selectedCartonMarks = new HashSet<>();
+        Map<Long, ReturnInventoryCarton> selectedReturnCartons = new LinkedHashMap<>();
+        Map<Long, Long> selectedReturnPackages = new LinkedHashMap<>();
         for (RelabelRequests.Item item : request.items()) {
             validateOperation(item);
             if (item.notifiedPackageCount() > item.totalPackageCount()) {
@@ -358,7 +368,11 @@ public class RelabelApplicationService implements WalletResultHandler {
                 throw badRequest("The same carton mark cannot create more than one relabel task");
             }
             if (item.returnCartonId() != null) {
-                ReturnInventoryCarton carton = returnCartons.lockId(item.returnCartonId());
+                ReturnInventoryCarton carton = selectedReturnCartons.get(item.returnCartonId());
+                if (carton == null) {
+                    carton = returnCartons.lockId(item.returnCartonId());
+                    if (carton != null) selectedReturnCartons.put(item.returnCartonId(), carton);
+                }
                 if (carton == null || !customerId.equals(carton.getCustomerId())
                     || !request.operationWarehouseId().trim().equals(carton.getOverseasWarehouseId())) {
                     throw conflict("所选退货箱不属于当前客户和操作仓");
@@ -366,8 +380,10 @@ public class RelabelApplicationService implements WalletResultHandler {
                 if (!"AVAILABLE".equals(carton.getStatus()) || carton.getRelabelApplicationId() != null) {
                     throw conflict("仓库唛头 " + carton.getCartonMark() + " 已不可用于换标");
                 }
-                if (!carton.getCartonMark().equalsIgnoreCase(item.cartonMark().trim())) {
-                    throw conflict("退货箱仓库唛头已变化，请重新查询");
+                long requestedPackages = selectedReturnPackages.merge(carton.getId(),
+                    (long) item.notifiedPackageCount(), Math::addExact);
+                if (requestedPackages > value(carton.getTotalQuantity())) {
+                    throw conflict("退货托盘 " + carton.getCartonMark() + " 可用箱数不足");
                 }
                 sources.add(new SourceInventory(item, null, carton));
                 continue;
@@ -438,9 +454,7 @@ public class RelabelApplicationService implements WalletResultHandler {
         application.setUpdatedAt(now);
         applications.insert(application);
 
-        for (SourceInventory source : sources) {
-            if (source.returnCarton() == null) continue;
-            ReturnInventoryCarton carton = source.returnCarton();
+        for (ReturnInventoryCarton carton : selectedReturnCartons.values()) {
             carton.setRelabelApplicationId(applicationId); carton.setRelabelNo(relabelNo);
             carton.setRelabelStatus("PENDING"); carton.setStatus("RELABEL_PENDING"); carton.setUpdatedAt(now);
             returnCartons.updateById(carton);
@@ -530,6 +544,12 @@ public class RelabelApplicationService implements WalletResultHandler {
         if (!STATUSES.contains(next)) throw badRequest("Unsupported relabel status");
         if (next.equals(application.getStatus())) return detail(customerId, relabelNo);
         validateTransition(application.getStatus(), next);
+        if (PENDING_REVIEW.equals(application.getStatus()) && PENDING_PROCESSING.equals(next)
+            && itemList(application.getId()).stream().anyMatch(item -> "RETURN_BULK_SKU_LABEL".equals(operationType(item)))) {
+            boolean hasCartonFile = StringUtils.hasText(application.getCartonTotalFileId());
+            boolean hasSkuFile = StringUtils.hasText(application.getSkuTotalFileId());
+            if (hasCartonFile == hasSkuFile) throw conflict("退货贴标审核前必须且只能上传一个箱唛总文件或 SKU 总文件");
+        }
         if ("PROCESSING".equals(next)
             && !Set.of("FROZEN", "NOT_REQUIRED").contains(application.getWalletStatus())) {
             throw conflict("Relabel funds must be frozen before processing");
@@ -541,6 +561,10 @@ public class RelabelApplicationService implements WalletResultHandler {
         applications.updateById(application);
         List<LastlegOrder> linkedOrders = tailOrders(application);
         if (linkedOrders.isEmpty()) throw conflict("Linked tail-leg order is missing");
+        if (PENDING_PROCESSING.equals(next)) {
+            application.setFulfillmentStatus("WAIT_RELABEL");
+            applications.updateById(application);
+        }
         if (CUSTOMER_CONFIRM_PENDING.equals(next)) {
             application.setFulfillmentStatus("WAIT_CUSTOMER_CONFIRMATION");
             applications.updateById(application);
@@ -586,6 +610,12 @@ public class RelabelApplicationService implements WalletResultHandler {
                 case "REJECTED", "CANCELLED" -> "CANCELLED";
                 default -> mainStatus;
             };
+            // Reviewing/processing a return relabel must not move the already
+            // completed inbound order back to assignment or relabel waiting.
+            if ("RETURN_RELABEL".equals(order.getOrderType())
+                && !Set.of("COMPLETED", "REJECTED", "CANCELLED").contains(next)) {
+                orderStatus = "INBOUND_COMPLETED";
+            }
             order.setCurrentStatus(orderStatus);
             order.setSubOrderStatus("RELABEL:" + next);
             order.setRelabelStatus(businessRelabelStatus(next));
@@ -595,6 +625,15 @@ public class RelabelApplicationService implements WalletResultHandler {
                 insertOrderHistory(customerId, order.getId(), orderBefore, orderStatus, request.remark(), now);
             }
         }
+        ReturnOrder returnOrder = returnOrders.selectOne(new LambdaQueryWrapper<ReturnOrder>()
+            .eq(ReturnOrder::getRelabelApplicationId, application.getId())
+            .eq(ReturnOrder::getCustomerId, customerId)
+            .last("LIMIT 1"));
+        if (returnOrder != null) {
+            returnOrder.setRelabelStatus(next);
+            returnOrder.setUpdatedAt(now);
+            returnOrders.updateById(returnOrder);
+        }
         insertHistory(customerId, application.getId(), before, next, operatorId, request.remark(), now);
         return detail(customerId, relabelNo);
     }
@@ -689,7 +728,7 @@ public class RelabelApplicationService implements WalletResultHandler {
         }
         List<RelabelItem> relabelItems = itemList(application.getId());
         boolean requiresOutbound = relabelItems.stream()
-            .anyMatch(item -> !"SKU_LABEL".equals(operationType(item)));
+            .anyMatch(item -> Set.of("CARTON_LABEL", "CARTON_AND_SKU").contains(operationType(item)));
         reviewTask.setStatus("COMPLETED"); reviewTask.setReviewDecision("CONFIRMED");
         reviewTask.setReviewerKey(operatorId); reviewTask.setReviewerName("客户确认");
         reviewTask.setReviewRemark(request.remark()); reviewTask.setReviewedAt(LocalDateTime.now());
@@ -721,6 +760,22 @@ public class RelabelApplicationService implements WalletResultHandler {
                     request.remark(), now);
             }
         }
+        ReturnOrder returnOrder = returnOrders.selectOne(new LambdaQueryWrapper<ReturnOrder>()
+            .eq(ReturnOrder::getRelabelApplicationId, application.getId())
+            .eq(ReturnOrder::getCustomerId, customerId)
+            .last("LIMIT 1"));
+        if (returnOrder != null) {
+            returnOrder.setRelabelStatus("COMPLETED");
+            returnOrder.setUpdatedAt(now);
+            returnOrders.updateById(returnOrder);
+        }
+        for (RelabelItem item : relabelItems) {
+            if (item.getReturnCartonId() == null) continue;
+            ReturnInventoryCarton carton = returnCartons.lockId(item.getReturnCartonId());
+            if (carton == null || !Objects.equals(carton.getRelabelApplicationId(), application.getId())) continue;
+            carton.setRelabelStatus("COMPLETED"); carton.setRelabelCompletedAt(now);
+            carton.setStatus("AVAILABLE"); carton.setUpdatedAt(now); returnCartons.updateById(carton);
+        }
         insertHistory(customerId, application.getId(), before, application.getStatus(), operatorId,
             request.remark(), now);
         // 仓储转运换标在客户确认后立即恢复为可排车，发车时再转为 OUTBOUNDED。
@@ -739,7 +794,8 @@ public class RelabelApplicationService implements WalletResultHandler {
                 transfer.setRelabelCompletedAt(now);
                 transfer.setUpdatedAt(now);
                 warehouseTransfers.updateById(transfer);
-                application.setFulfillmentStatus(transferStatus);
+                application.setFulfillmentStatus("READY_FOR_DISPATCH".equals(transferStatus)
+                    ? "WAIT_PRE_DISPATCH" : transferStatus);
                 applications.updateById(application);
                 // 转运单自身的尾程订单与换标申请尾程订单是两条记录，需同步释放原转运单参与排车。
                 LastlegOrder transferOrder = orders.selectById(transfer.getLastlegOrderId());
@@ -1057,7 +1113,8 @@ public class RelabelApplicationService implements WalletResultHandler {
         orderHistories.insert(value);
     }
     private static void validateTransition(String from, String to) {
-        boolean allowed = PENDING_PROCESSING.equals(from) && Set.of("PROCESSING", "REJECTED", "CANCELLED").contains(to)
+        boolean allowed = PENDING_REVIEW.equals(from) && Set.of(PENDING_PROCESSING, "REJECTED", "CANCELLED").contains(to)
+            || PENDING_PROCESSING.equals(from) && Set.of("PROCESSING", "REJECTED", "CANCELLED").contains(to)
             || "PROCESSING".equals(from) && Set.of(CUSTOMER_CONFIRM_PENDING, "REJECTED", "CANCELLED").contains(to)
             || CUSTOMER_CONFIRM_PENDING.equals(from) && Set.of(READY_FOR_OUTBOUND, "REJECTED", "CANCELLED").contains(to)
             || READY_FOR_OUTBOUND.equals(from) && Set.of("COMPLETED", "CANCELLED").contains(to);
@@ -1065,7 +1122,9 @@ public class RelabelApplicationService implements WalletResultHandler {
     }
 
     private static String businessRelabelStatus(String workflowStatus) {
-        if ("PROCESSING".equals(workflowStatus)) return "PROCESSING";
+        if (Set.of(PENDING_REVIEW, PENDING_PROCESSING, "PROCESSING", "REJECTED", "CANCELLED").contains(workflowStatus)) {
+            return workflowStatus;
+        }
         return Set.of(CUSTOMER_CONFIRM_PENDING, READY_FOR_OUTBOUND, "COMPLETED").contains(workflowStatus)
             ? "COMPLETED" : PENDING_PROCESSING;
     }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelBindingGuard.java b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelBindingGuard.java
index 63dc446ae..be761f0a4 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelBindingGuard.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelBindingGuard.java
@@ -7,6 +7,7 @@ import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
 import com.baiyue.lastleg.relabel.pda.entity.PdaRelabelHistory;
 import com.baiyue.lastleg.relabel.pda.mapper.PdaRelabelHistoryMapper;
 import com.baiyue.lastleg.inventory.mapper.InventoryPositionMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -20,12 +21,14 @@ public class RelabelBindingGuard {
     @Resource private RelabelItemMapper items;
     @Resource private PdaRelabelHistoryMapper histories;
     @Resource private InventoryPositionMapper positions;
+    @Resource private ReturnInventoryCartonMapper returnCartons;
     @Resource private ObjectMapper objectMapper;
 
     public void requireBound(RelabelApplication app) {
         List<RelabelItem> cartons = items.selectList(new QueryWrapper<RelabelItem>()
             .eq("application_id", app.getId()).eq("customer_id", app.getCustomerId()))
-            .stream().filter(item -> !"SKU_LABEL".equals(item.getOperationType())).toList();
+            .stream().filter(item -> Set.of("CARTON_LABEL", "CARTON_AND_SKU", "RETURN_BULK_SKU_LABEL")
+                .contains(item.getOperationType())).toList();
         if (cartons.isEmpty()) return;
         Map<String, Set<String>> bindings = new HashMap<>();
         for (PdaRelabelHistory history : histories.selectList(new QueryWrapper<PdaRelabelHistory>()
@@ -41,6 +44,13 @@ public class RelabelBindingGuard {
             } catch (Exception e) { throw conflict("组托记录无法读取，请核对后重试"); }
         }
         for (RelabelItem item : cartons) {
+            if ("RETURN_BULK_SKU_LABEL".equals(item.getOperationType())) {
+                var carton = item.getReturnCartonId() == null ? null : returnCartons.selectById(item.getReturnCartonId());
+                if (carton == null || !bindings.getOrDefault(item.getCartonMark(), Set.of()).contains(carton.getPalletCode())
+                    || !"PROCESSING".equals(carton.getRelabelStatus()))
+                    throw conflict("退货箱 " + item.getCartonMark() + " 尚未绑定带目的仓的新托盘，不能完成换标");
+                continue;
+            }
             var position = item.getSourceInventoryPositionId() == null ? null
                 : positions.findTenantPosition(app.getCustomerId(), item.getSourceInventoryPositionId());
             if (position == null || !bindings.getOrDefault(item.getCartonMark(), Set.of()).contains(position.getPalletNo())
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PdaReturnReceiptController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PdaReturnReceiptController.java
index 4b348547e..c3547af94 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PdaReturnReceiptController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PdaReturnReceiptController.java
@@ -6,17 +6,28 @@ import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
 import com.baiyue.lastleg.returnreceipt.dto.PdaReturnReceiptRequests;
 import com.baiyue.lastleg.returnreceipt.dto.PdaReturnReceiptResponses;
 import com.baiyue.lastleg.returnreceipt.service.ReturnReceiptService;
+import com.baiyue.lastleg.palletops.gateway.PalletPhysicalGateway;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.http.MediaType;
+import org.springframework.web.multipart.MultipartFile;
+import com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway;
 
 @RestController
 @RequestMapping("/api/pda/v1/last-leg/return-receipts")
 @PreAuthorize("hasAuthority('lastleg:pda:operate') and hasAuthority('ROLE_OVERSEAS_WAREHOUSE_PDA_OPERATOR')")
 public class PdaReturnReceiptController {
     @Resource private ReturnReceiptService service;
+    @Resource private PalletPhysicalGateway physicalPallets;
+    @Resource private ReturnInventoryCartonMapper inventoryCartons;
+    @Resource private ReturnInventoryCartonItemMapper inventoryCartonItems;
+    @Resource private com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper returnOrders;
+    @Resource private RelabelPhotoFileGateway photoFiles;
     @PostMapping("/start") public ApiResponse<PdaReturnReceiptResponses.Start> start(@AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody PdaReturnReceiptRequests.Start request) {
         return ApiResponse.success(service.start(PdaWarehouseIdentity.require(user), request));
@@ -30,4 +41,61 @@ public class PdaReturnReceiptController {
         PdaWarehouseIdentity identity = PdaWarehouseIdentity.require(user);
         return ApiResponse.success(service.confirm(identity, request));
     }
+    @PostMapping("/{returnNo}/manual-complete") public ApiResponse<com.baiyue.lastleg.returnreceipt.dto.ReturnOrderResponses.Detail> manualComplete(
+        @AuthenticationPrincipal AuthenticatedUser user, @PathVariable String returnNo, @Valid @RequestBody PdaReturnReceiptRequests.ManualComplete request) {
+        return ApiResponse.success(service.manualComplete(PdaWarehouseIdentity.require(user), returnNo, request));
+    }
+    public record Pallet(String palletCode, long palletId, String status, String printableHtml) { }
+    public record Photo(long fileId, String fileName, String contentType, long sizeBytes) { }
+    @PostMapping(value = "/{returnNo}/photos/files", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ApiResponse<Photo> uploadPhoto(@AuthenticationPrincipal AuthenticatedUser user, @PathVariable String returnNo,
+        @RequestPart("file") MultipartFile file) {
+        PdaWarehouseIdentity identity = PdaWarehouseIdentity.require(user);
+        var order = returnOrders.findActiveNo(String.valueOf(identity.overseasWarehouseId()), returnNo);
+        if (order == null) throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.NOT_FOUND, "当前仓没有该待签收退货单");
+        if (file == null || file.isEmpty()) throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.BAD_REQUEST, "请选择退货打托照片");
+        if (file.getSize() > 10L * 1024 * 1024) throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.BAD_REQUEST, "照片不能超过 10MB");
+        if (file.getContentType() == null || !file.getContentType().toLowerCase(java.util.Locale.ROOT).startsWith("image/")) throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.BAD_REQUEST, "只能上传图片");
+        var uploaded = photoFiles.upload(order.getCustomerId(), order.getId(), user.userId(), file);
+        return ApiResponse.success(new Photo(uploaded.fileId(), uploaded.fileName(), uploaded.contentType(), uploaded.sizeBytes()));
+    }
+    @GetMapping("/{returnNo}/photos/files/{fileId}/download")
+    public org.springframework.http.ResponseEntity<byte[]> downloadPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String returnNo, @PathVariable long fileId) {
+        var file = service.downloadPhoto(PdaWarehouseIdentity.require(user), returnNo, fileId);
+        return org.springframework.http.ResponseEntity.ok().contentType(org.springframework.http.MediaType.parseMediaType(file.contentType()))
+            .header("Cache-Control", "no-store").body(file.content());
+    }
+    @PostMapping("/pallets") public ApiResponse<Pallet> createPallet(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody PdaReturnReceiptRequests.Pallet request) {
+        PdaWarehouseIdentity identity = PdaWarehouseIdentity.require(user);
+        if (returnOrders.findActiveNo(String.valueOf(identity.overseasWarehouseId()), request.returnNo()) == null) {
+            throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.NOT_FOUND, "当前仓没有该待签收退货单");
+        }
+        var pallet = physicalPallets.ensureRelabelPallet(identity.overseasWarehouseId(),
+            "RETURN:" + request.returnNo() + ":" + request.skuCode() + ":" + System.nanoTime());
+        String code = org.springframework.web.util.HtmlUtils.htmlEscape(pallet.palletCode());
+        String returnNo = org.springframework.web.util.HtmlUtils.htmlEscape(request.returnNo());
+        String sku = org.springframework.web.util.HtmlUtils.htmlEscape(request.skuCode());
+        String html = "<!doctype html><html><head><meta charset=\"UTF-8\"><title>" + code + "</title><style>@page{size:100mm 70mm;margin:4mm}body{font-family:Arial,sans-serif;text-align:center;margin:0}h1{font-size:24px;margin:7mm 0 3mm}.code{font-size:17px;font-weight:700;word-break:break-all}.ref{font-size:11px;margin-top:4mm}</style></head><body><h1>退货托盘标签</h1><div class=\"code\">" + code + "</div><div class=\"ref\">退货单：" + returnNo + "<br>SKU：" + sku + "</div></body></html>";
+        return ApiResponse.success(new Pallet(pallet.palletCode(), pallet.palletId(), pallet.status(), html));
+    }
+    @PostMapping("/pallets/check") public ApiResponse<PdaReturnReceiptResponses.PalletCheck> checkPallet(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody PdaReturnReceiptRequests.CheckPallet request) {
+        PdaWarehouseIdentity identity = PdaWarehouseIdentity.require(user);
+        var order = returnOrders.findActiveNo(String.valueOf(identity.overseasWarehouseId()), request.returnNo().trim());
+        if (order == null) throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.NOT_FOUND, "当前仓没有该待签收退货单");
+        var physical = physicalPallets.resolve(request.palletCode().trim());
+        if (physical == null || physical.warehouseId() != identity.overseasWarehouseId()) {
+            throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.NOT_FOUND, "当前仓没有该托盘");
+        }
+        var inventory = inventoryCartons.listPalletInventory(String.valueOf(identity.overseasWarehouseId()), physical.palletCode());
+        if (inventory.isEmpty()) return ApiResponse.success(new PdaReturnReceiptResponses.PalletCheck(physical.palletCode(), true, java.util.List.of(), 0));
+        if (inventory.stream().anyMatch(carton -> !order.getReturnNo().equals(carton.getSourceReturnNo()))) {
+            throw new org.springframework.web.server.ResponseStatusException(org.springframework.http.HttpStatus.CONFLICT, "该托盘已绑定其他退货单，不能用于当前退货单");
+        }
+        java.util.LinkedHashSet<String> skuCodes = new java.util.LinkedHashSet<>(); long quantity = 0;
+        for (var carton : inventory) for (var item : inventoryCartonItems.listCarton(carton.getId())) { skuCodes.add(item.getSkuCode()); quantity += item.getQuantity() == null ? 0 : item.getQuantity(); }
+        return ApiResponse.success(new PdaReturnReceiptResponses.PalletCheck(physical.palletCode(), false, java.util.List.copyOf(skuCodes), quantity));
+    }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PlatformReturnOrderController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PlatformReturnOrderController.java
new file mode 100644
index 000000000..ef7009596
--- /dev/null
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/PlatformReturnOrderController.java
@@ -0,0 +1,22 @@
+package com.baiyue.lastleg.returnreceipt.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.lastleg.returnreceipt.dto.ReturnOrderRequests;
+import com.baiyue.lastleg.returnreceipt.dto.ReturnOrderResponses;
+import com.baiyue.lastleg.returnreceipt.service.ReturnReceiptService;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/platform/v1/last-leg/return-orders")
+@PreAuthorize("hasAuthority('platform:overseas-warehouse:return-inventory:list')")
+public class PlatformReturnOrderController {
+    @Resource private ReturnReceiptService service;
+    @PostMapping("/{returnNo}/review")
+    public ApiResponse<ReturnOrderResponses.Detail> review(@RequestHeader("X-Customer-Id") String customerId,
+        @PathVariable String returnNo, @Valid @RequestBody ReturnOrderRequests.Review request) {
+        return ApiResponse.success(service.review(customerId, returnNo, request));
+    }
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptRequests.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptRequests.java
index 4952832b6..d5d6a6d62 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptRequests.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptRequests.java
@@ -12,10 +12,13 @@ public final class PdaReturnReceiptRequests {
     private PdaReturnReceiptRequests() { }
     public record Start(@NotBlank @Size(max = 128) String returnNo) { }
     public record SkuLookup(@NotBlank @Size(max = 128) String skuCode) { }
+    public record Pallet(@NotBlank @Size(max = 128) String returnNo, @NotBlank @Size(max = 128) String skuCode) { }
+    public record CheckPallet(@NotBlank @Size(max = 128) String returnNo, @NotBlank @Size(max = 128) String palletCode) { }
+    public record ManualComplete(@NotBlank @Size(max = 500) String discrepancyReason) { }
     public record Confirm(@NotBlank @Size(max = 128) String returnNo,
                           @Size(max = 128) String trackingNo,
                           @NotBlank @Size(max = 16) String startedBy,
-                          @Size(max = 128) String cartonMark,
+                          @NotBlank @Size(max = 128) String palletCode,
                           @NotEmpty @Size(max = 500) List<@Valid Item> items,
                           @NotBlank @Size(max = 255) String idempotencyKey) { }
     public record Item(@NotBlank @Size(max = 128) String skuCode,
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptResponses.java
index eecb4b1c9..d60e7bb1b 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/PdaReturnReceiptResponses.java
@@ -5,13 +5,16 @@ import java.util.List;
 
 public final class PdaReturnReceiptResponses {
     private PdaReturnReceiptResponses() { }
-    public record Start(String returnNo, String status, List<Item> expectedItems) { }
+    public record Start(String returnNo, String status, List<Item> expectedItems, List<CompletedPallet> completedPallets, List<Photo> photos) { }
+    public record Photo(long fileId, String fileName, String contentType, long sizeBytes) { }
+    public record CompletedPallet(String palletCode, String skuCode, long quantity, String receiptBatchNo) { }
+    public record PalletCheck(String palletCode, boolean empty, List<String> skuCodes, long quantity) { }
     public record SkuCandidates(String skuCode, List<Candidate> candidates) { }
     public record Candidate(String returnNo, String customerId, String customerReferenceNo, String status,
                             long skuExpectedQuantity, long skuReceivedQuantity, long orderExpectedQuantity,
                             long orderReceivedQuantity) { }
     public record Item(String skuCode, String productNameZh, long expectedQuantity, long receivedQuantity) { }
-    public record Confirmed(String returnNo, String receiptNo, String receiptBatchNo, String cartonMark, String orderStatus,
+    public record Confirmed(String returnNo, String receiptNo, String receiptBatchNo, String palletCode, String orderStatus,
                             boolean fullyMatched, long expectedQuantity, long receivedQuantity,
                             LocalDateTime signedAt) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderRequests.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderRequests.java
index 889d7b642..f577a1e83 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderRequests.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderRequests.java
@@ -28,8 +28,13 @@ public final class ReturnOrderRequests {
                         String trackingNo, String skuCode, String status) {
         public Query { if (page == 0) page = 1; if (size == 0) size = 20; }
     }
-    public record RelabelCreate(@NotEmpty @Size(max = 500) List<@NotBlank @Size(max = 255) String> cartonMarks,
+    public record RelabelCreate(@NotEmpty @Size(max = 500) List<@Valid RelabelItem> items,
+                                @NotBlank @Size(max = 16) String fileScope,
+                                @NotBlank @Size(max = 128) String destinationFbaWarehouseId,
+                                @NotBlank @Size(max = 128) String destinationFbaWarehouseCode,
                                 @NotBlank @Size(max = 255) String idempotencyKey,
-                                @Size(max = 128) String contactName, @Size(max = 64) String contactPhone,
-                                @Size(max = 32) String deliveryMethod, @Size(max = 1000) String remark) {}
+                                @Size(max = 1000) String cartonRemark) {}
+    public record RelabelItem(@NotBlank @Size(max = 128) String skuCode,
+                              @Positive long quantity) {}
+    public record Review(@NotBlank String decision, @Size(max = 500) String remark) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderResponses.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderResponses.java
index bbc57322a..8011f4288 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderResponses.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/dto/ReturnOrderResponses.java
@@ -8,14 +8,17 @@ public final class ReturnOrderResponses {
     public record Summary(String returnNo, String lastlegOrderNo, String overseasWarehouseId,
                           String warehouseContactName, String warehouseContactPhone, String customerReferenceNo, String status,
                           int skuTypes, long expectedQuantity, long receivedQuantity, boolean needRelabel,
-                          String relabelNo, String relabelStatus, LocalDateTime createdAt) { }
+                          String relabelNo, String relabelStatus, String discrepancyReason, LocalDateTime createdAt) { }
     public record Item(String skuCode, String productNameZh, long expectedQuantity,
                        long receivedQuantity) { }
-    public record Detail(Summary order, String remark, List<Item> items, List<Receipt> receipts) { }
-    public record Receipt(String receiptNo, String receiptBatchNo, String cartonMark, String trackingNo, String startedBy,
+    public record Detail(Summary order, String remark, List<Item> items, List<Receipt> receipts, List<PalletDetail> pallets, List<Photo> photos) { }
+    public record Photo(long fileId, String fileName, String contentType, long sizeBytes) { }
+    public record PalletDetail(String palletCode, int skuTypes, long totalQuantity, List<PalletItem> items) { }
+    public record PalletItem(String skuCode, String productNameZh, long quantity) { }
+    public record Receipt(String receiptNo, String receiptBatchNo, String palletCode, String trackingNo, String startedBy,
                           long receivedQuantity, String operatorName, LocalDateTime signedAt) { }
     public record RelabelCandidate(Long cartonId, String cartonMark, String sourceReturnNo, String status,
                                    long totalQuantity, List<Item> items, String relabelStatus) { }
     public record RelabelCreated(String relabelNo, Long relabelApplicationId, String returnNo,
-                                  List<String> cartonMarks, String status) { }
+                                  List<String> skuCodes, String status) { }
 }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnInventoryCarton.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnInventoryCarton.java
index 95e724962..27a72cffb 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnInventoryCarton.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnInventoryCarton.java
@@ -18,6 +18,7 @@ public class ReturnInventoryCarton {
     private Long sourceReceiptId;
     private String sourceBatchNo;
     private String sourceReturnNo;
+    private String palletCode;
     private String cartonMark;
     private String fbaCartonMark;
     private String destinationWarehouseCode;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnOrder.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnOrder.java
index 8b9175362..467823d4b 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnOrder.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnOrder.java
@@ -28,6 +28,8 @@ public class ReturnOrder {
     private Long expectedQuantity;
     private Long receivedQuantity;
     private String remark;
+    private String discrepancyReason;
+    private LocalDateTime manuallyCompletedAt;
     private String idempotencyKey;
     private String requestHash;
     private String createdBy;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnReceipt.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnReceipt.java
index 449d7a130..9732fbea8 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnReceipt.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/entity/ReturnReceipt.java
@@ -15,6 +15,7 @@ public class ReturnReceipt {
     private String customerId;
     private String receiptNo;
     private String receiptBatchNo;
+    private String palletCode;
     private String cartonMark;
     private String trackingNo;
     private String boundBy;
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
index 17807822d..e636fb9fb 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
@@ -5,6 +5,7 @@ import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import java.util.List;
 
 @Mapper
@@ -35,9 +36,25 @@ public interface ReturnInventoryCartonMapper extends BaseMapper<ReturnInventoryC
     @Select("SELECT * FROM ll_return_inventory_carton WHERE id=#{id} FOR UPDATE")
     ReturnInventoryCarton lockId(@Param("id") long id);
 
+    @Update("UPDATE ll_return_inventory_carton SET total_quantity=#{remaining},sku_types=1,status='AVAILABLE'," +
+        "relabel_application_id=NULL,relabel_no=NULL,relabel_status=NULL,updated_at=NOW(3) " +
+        "WHERE id=#{id} AND customer_id=#{customerId} AND relabel_application_id=#{applicationId} " +
+        "AND status='RELABEL_PENDING' AND total_quantity>#{remaining}")
+    int releasePartial(@Param("id") long id, @Param("customerId") String customerId,
+                       @Param("applicationId") long applicationId, @Param("remaining") long remaining);
+
     @Select("SELECT * FROM ll_return_inventory_carton WHERE source_receipt_id=#{receiptId} LIMIT 1")
     ReturnInventoryCarton findReceipt(@Param("receiptId") long receiptId);
 
+    @Select("SELECT c.* FROM ll_return_inventory_carton c JOIN ll_return_inventory_carton_item i ON i.carton_id=c.id WHERE c.customer_id=#{customerId} AND c.overseas_warehouse_id=#{warehouseId} AND c.pallet_code=#{palletCode} AND c.status='AVAILABLE' ORDER BY c.id LIMIT 1 FOR UPDATE")
+    ReturnInventoryCarton findPalletSku(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId, @Param("palletCode") String palletCode);
+
+    @Select("SELECT * FROM ll_return_inventory_carton WHERE overseas_warehouse_id=#{warehouseId} AND pallet_code=#{palletCode} AND status='AVAILABLE' ORDER BY id LIMIT 1")
+    ReturnInventoryCarton findPalletSkuForCheck(@Param("customerId") String ignoredCustomerId, @Param("warehouseId") String warehouseId, @Param("palletCode") String palletCode);
+
+    @Select("SELECT * FROM ll_return_inventory_carton WHERE overseas_warehouse_id=#{warehouseId} AND pallet_code=#{palletCode} AND status='AVAILABLE' ORDER BY id")
+    List<ReturnInventoryCarton> listPalletInventory(@Param("warehouseId") String warehouseId, @Param("palletCode") String palletCode);
+
     @Select("SELECT * FROM ll_return_inventory_carton WHERE customer_id=#{customerId} AND carton_mark=#{cartonMark} LIMIT 1")
     ReturnInventoryCarton findCustomerMark(@Param("customerId") String customerId, @Param("cartonMark") String cartonMark);
 
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnReceiptItemMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnReceiptItemMapper.java
index e8d437be1..a20a99f67 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnReceiptItemMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnReceiptItemMapper.java
@@ -3,6 +3,12 @@ package com.baiyue.lastleg.returnreceipt.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnReceiptItem;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import java.util.List;
 
 @Mapper
-public interface ReturnReceiptItemMapper extends BaseMapper<ReturnReceiptItem> { }
+public interface ReturnReceiptItemMapper extends BaseMapper<ReturnReceiptItem> {
+    @Select("SELECT * FROM ll_return_receipt_item WHERE receipt_id=#{receiptId} ORDER BY id")
+    List<ReturnReceiptItem> listReceipt(@Param("receiptId") long receiptId);
+}
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
index 02460fc85..d8b4bfa9f 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
@@ -63,6 +63,9 @@ public class ReturnInventoryService {
     public ReturnInventoryCarton createReceiptCarton(ReturnOrder order, ReturnReceipt receipt,
                                                       String requestedMark, List<ReceiptLine> lines) {
         if (lines.isEmpty()) throw new IllegalArgumentException("退货签收库存明细不能为空");
+        if (lines.size() != 1) throw conflict("一个签收批次只能签收一个 SKU");
+        String normalizedPalletCode = required(receipt.getPalletCode(), "托盘码不能为空");
+        required(lines.get(0).skuCode(), "SKU 不能为空");
         String cartonMark = text(requestedMark);
         long cartonId = IdWorker.getId();
         if (cartonMark == null) cartonMark = numbers.next("RETURN_CARTON", order.getOverseasWarehouseId(), cartonId);
@@ -73,6 +76,7 @@ public class ReturnInventoryService {
         carton.setId(cartonId); carton.setCustomerId(order.getCustomerId()); carton.setOverseasWarehouseId(order.getOverseasWarehouseId());
         carton.setSourceReceiptId(receipt.getId()); carton.setSourceBatchNo(receipt.getReceiptBatchNo());
         carton.setSourceReturnNo(order.getReturnNo()); carton.setCartonMark(cartonMark);
+        carton.setPalletCode(normalizedPalletCode);
         carton.setStatus(AVAILABLE); carton.setSkuTypes(lines.size()); carton.setTotalQuantity(total); carton.setCreatedAt(now); carton.setUpdatedAt(now);
         cartons.insert(carton);
         for (ReceiptLine line : lines) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
index e2c97cf83..609534dc7 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptService.java
@@ -25,6 +25,7 @@ import com.baiyue.lastleg.relabel.entity.RelabelApplication;
 import com.baiyue.lastleg.relabel.entity.RelabelItem;
 import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
 import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
+import com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
@@ -55,6 +56,7 @@ import java.util.Set;
 @Service
 public class ReturnReceiptService {
     public static final String PENDING_RECEIPT = "PENDING_RECEIPT";
+    public static final String PENDING_REVIEW = "PENDING_REVIEW";
     public static final String PARTIALLY_RECEIVED = "PARTIALLY_RECEIVED";
     public static final String COMPLETED = "COMPLETED";
 
@@ -71,6 +73,8 @@ public class ReturnReceiptService {
     @Resource private ReturnInventoryCartonItemMapper cartonItems;
     @Resource private RelabelApplicationMapper relabelApplications;
     @Resource private RelabelItemMapper relabelItems;
+    @Resource private com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway photoFiles;
+    @Resource private com.baiyue.lastleg.service.FbaWarehouseValidator fbaWarehouseValidator;
 
     @Transactional
     public ReturnOrderResponses.Detail create(String customerId, String operatorId, ReturnOrderRequests.Create request) {
@@ -92,7 +96,7 @@ public class ReturnReceiptService {
         order.setWarehouseContactName(text(request.warehouseContactName()));
         order.setWarehouseContactPhone(text(request.warehouseContactPhone()));
         order.setReturnNo(numbers.next("RETURN", order.getOverseasWarehouseId(), order.getId()));
-        order.setCustomerReferenceNo(text(request.customerReferenceNo())); order.setNeedRelabel(request.needRelabel()); order.setStatus(PENDING_RECEIPT);
+        order.setCustomerReferenceNo(text(request.customerReferenceNo())); order.setNeedRelabel(request.needRelabel()); order.setStatus(PENDING_REVIEW);
         order.setExpectedSkuTypes(skuCodes.size()); order.setExpectedQuantity(expected); order.setReceivedQuantity(0L);
         order.setRemark(text(request.remark())); order.setIdempotencyKey(key); order.setRequestHash(requestHash);
         order.setCreatedBy(text(operatorId)); order.setCreatedAt(now); order.setUpdatedAt(now);
@@ -121,8 +125,8 @@ public class ReturnReceiptService {
         tail.setSourceRegion("CUSTOMER"); tail.setSourceInboundId(returnOrder.getReturnNo());
         tail.setSourceOrderId(String.valueOf(returnOrder.getId()));
         tail.setSourceOrderNo(returnOrder.getReturnNo()); tail.setOverseasWarehouseId(returnOrder.getOverseasWarehouseId());
-        tail.setCurrentStatus("PENDING_ASSIGNMENT"); tail.setSubOrderStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "RETURN_RELABEL:PENDING_BINDING" : "RETURN_RELABEL:NOT_REQUIRED");
-        tail.setRelabelStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "PENDING_BINDING" : "NOT_REQUIRED");
+        tail.setCurrentStatus(PENDING_REVIEW); tail.setSubOrderStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? "RETURN_RELABEL:PENDING_REVIEW" : "RETURN_RELABEL:NOT_REQUIRED");
+        tail.setRelabelStatus(Boolean.TRUE.equals(returnOrder.getNeedRelabel()) ? PENDING_REVIEW : "NOT_REQUIRED");
         tail.setCustomerRemark(returnOrder.getRemark()); tail.setSourceEventId("RETURN_ORDER:" + returnOrder.getReturnNo());
         tail.setSourceLoadingPlanId("RETURN_RELABEL"); tail.setCreatedAt(now); tail.setUpdatedAt(now);
         tail.setSourcePayloadHash(returnOrder.getRequestHash());
@@ -132,6 +136,30 @@ public class ReturnReceiptService {
         orders.updateById(returnOrder);
     }
 
+    @Transactional
+    public ReturnOrderResponses.Detail updatePending(String customerId, String returnNo, ReturnOrderRequests.Create request) {
+        ReturnOrder order = orders.findNo(customerId, text(returnNo));
+        if (order == null) throw notFound("退货预报不存在");
+        if (!PENDING_REVIEW.equals(order.getStatus())) throw conflict("只有待审核退货预报可以修改");
+        Set<String> skus = new LinkedHashSet<>(); long expected = 0;
+        for (ReturnOrderRequests.Item input : request.items()) { if (!skus.add(norm(input.skuCode()))) throw badRequest("同一退货单不能重复预报相同 SKU"); expected = Math.addExact(expected, input.expectedQuantity()); }
+        order.setOverseasWarehouseId(text(request.overseasWarehouseId())); order.setWarehouseContactName(text(request.warehouseContactName()));
+        order.setWarehouseContactPhone(text(request.warehouseContactPhone())); order.setCustomerReferenceNo(text(request.customerReferenceNo()));
+        order.setNeedRelabel(request.needRelabel()); order.setRemark(text(request.remark())); order.setExpectedSkuTypes(skus.size()); order.setExpectedQuantity(expected); order.setUpdatedAt(LocalDateTime.now()); orders.updateById(order);
+        orderItems.delete(new LambdaQueryWrapper<ReturnOrderItem>().eq(ReturnOrderItem::getReturnOrderId, order.getId()));
+        for (ReturnOrderRequests.Item input : request.items()) { ReturnOrderItem item = new ReturnOrderItem(); item.setId(IdWorker.getId()); item.setReturnOrderId(order.getId()); item.setCustomerId(customerId); item.setSkuCode(text(input.skuCode())); item.setProductNameZh(text(input.productNameZh())); item.setExpectedQuantity(input.expectedQuantity()); item.setReceivedQuantity(0L); item.setCreatedAt(LocalDateTime.now()); item.setUpdatedAt(LocalDateTime.now()); orderItems.insert(item); }
+        return detail(customerId, returnNo);
+    }
+
+    @Transactional
+    public ReturnOrderResponses.Detail cancelPending(String customerId, String returnNo) {
+        ReturnOrder order = orders.findNo(customerId, text(returnNo));
+        if (order == null) throw notFound("退货预报不存在");
+        if (!PENDING_REVIEW.equals(order.getStatus())) throw conflict("只有待审核退货预报可以取消");
+        order.setStatus("CANCELLED"); order.setUpdatedAt(LocalDateTime.now()); orders.updateById(order);
+        return detail(customerId, returnNo);
+    }
+
     @Transactional(readOnly = true)
     public PageResult<ReturnOrderResponses.Summary> page(String customerId, ReturnOrderRequests.Query query) {
         LambdaQueryWrapper<ReturnOrder> w = new LambdaQueryWrapper<ReturnOrder>()
@@ -166,11 +194,56 @@ public class ReturnReceiptService {
     public ReturnOrderResponses.Detail detail(String customerId, String returnNo) {
         ReturnOrder order = orders.findNo(customerId, text(returnNo));
         if (order == null) throw notFound("退货单不存在");
-        List<ReturnOrderResponses.Item> items = orderItems.listOrder(order.getId()).stream().map(this::item).toList();
-        List<ReturnOrderResponses.Receipt> receiptViews = receipts.listOrder(order.getId()).stream().map(receipt ->
-            new ReturnOrderResponses.Receipt(receipt.getReceiptNo(), receipt.getReceiptBatchNo(), receipt.getCartonMark(), receipt.getTrackingNo(),
+        List<ReturnOrderItem> orderLines = orderItems.listOrder(order.getId());
+        List<ReturnOrderResponses.Item> items = orderLines.stream().map(this::item).toList();
+        List<ReturnReceipt> orderReceipts = receipts.listOrder(order.getId());
+        List<ReturnOrderResponses.Receipt> receiptViews = orderReceipts.stream().map(receipt ->
+            new ReturnOrderResponses.Receipt(receipt.getReceiptNo(), receipt.getReceiptBatchNo(), receipt.getPalletCode(), receipt.getTrackingNo(),
                 receipt.getBoundBy(), value(receipt.getReceivedQuantity()), receipt.getOperatorName(), receipt.getSignedAt())).toList();
-        return new ReturnOrderResponses.Detail(summary(order), order.getRemark(), items, receiptViews);
+        Map<String, Map<String, ReturnOrderResponses.PalletItem>> palletItems = new LinkedHashMap<>();
+        Map<String, String> productNames = new LinkedHashMap<>();
+        for (ReturnOrderItem line : orderLines) productNames.put(line.getSkuCode(), line.getProductNameZh());
+        for (ReturnReceipt receipt : orderReceipts) {
+            if (text(receipt.getPalletCode()) == null) continue;
+            Map<String, ReturnOrderResponses.PalletItem> bySku = palletItems.computeIfAbsent(receipt.getPalletCode(), ignored -> new LinkedHashMap<>());
+            for (ReturnReceiptItem line : receiptItems.listReceipt(receipt.getId())) bySku.merge(line.getSkuCode(),
+                new ReturnOrderResponses.PalletItem(line.getSkuCode(), productNames.get(line.getSkuCode()), value(line.getReceivedQuantity())),
+                (left, right) -> new ReturnOrderResponses.PalletItem(left.skuCode(), text(left.productNameZh()) == null ? right.productNameZh() : left.productNameZh(), left.quantity() + right.quantity()));
+        }
+        List<ReturnOrderResponses.PalletDetail> palletViews = palletItems.entrySet().stream().map(entry -> {
+            List<ReturnOrderResponses.PalletItem> palletLines = List.copyOf(entry.getValue().values());
+            return new ReturnOrderResponses.PalletDetail(entry.getKey(), palletLines.size(), palletLines.stream().mapToLong(ReturnOrderResponses.PalletItem::quantity).sum(), palletLines);
+        }).toList();
+        List<ReturnOrderResponses.Photo> photos = photoList(order).stream()
+            .map(file -> new ReturnOrderResponses.Photo(file.fileId(), file.fileName(), file.contentType(), file.sizeBytes())).toList();
+        return new ReturnOrderResponses.Detail(summary(order), order.getRemark(), items, receiptViews, palletViews, photos);
+    }
+
+    public com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway.DownloadedFile downloadPhoto(String customerId, String returnNo, long fileId) {
+        ReturnOrder order = orders.findNo(customerId, text(returnNo));
+        if (order == null) throw notFound("退货单不存在");
+        return photoFiles.download(order.getCustomerId(), order.getId(), fileId);
+    }
+
+    @Transactional
+    public ReturnOrderResponses.Detail review(String customerId, String returnNo, ReturnOrderRequests.Review request) {
+        ReturnOrder order = orders.findNo(customerId, text(returnNo));
+        if (order == null) throw notFound("退货预报不存在");
+        if (!PENDING_REVIEW.equals(order.getStatus())) throw conflict("只有待审核退货预报可以审核");
+        String decision = norm(request.decision());
+        if (!Set.of("APPROVE", "REJECT").contains(decision)) throw badRequest("decision 必须为 APPROVE 或 REJECT");
+        if ("REJECT".equals(decision) && text(request.remark()) == null) throw badRequest("审核驳回必须填写原因");
+        order.setStatus("APPROVE".equals(decision) ? PENDING_RECEIPT : "REJECTED");
+        if ("REJECT".equals(decision)) order.setRemark(text(request.remark()));
+        order.setUpdatedAt(LocalDateTime.now()); orders.updateById(order);
+        LastlegOrder tail = order.getLastlegOrderId() == null ? null : lastlegOrders.selectById(order.getLastlegOrderId());
+        if (tail != null) {
+            tail.setCurrentStatus("APPROVE".equals(decision) ? PENDING_RECEIPT : "REJECTED");
+            tail.setSubOrderStatus("RETURN_RELABEL:" + ("APPROVE".equals(decision) ? PENDING_RECEIPT : "REJECTED"));
+            tail.setRelabelStatus("APPROVE".equals(decision) && Boolean.TRUE.equals(order.getNeedRelabel()) ? "WAIT_INBOUND" : ("APPROVE".equals(decision) ? "NOT_REQUIRED" : "REJECTED"));
+            tail.setUpdatedAt(LocalDateTime.now()); lastlegOrders.updateById(tail);
+        }
+        return detail(customerId, returnNo);
     }
 
     @Transactional(readOnly = true)
@@ -195,44 +268,119 @@ public class ReturnReceiptService {
         ReturnOrder order = orders.findNo(customerId, text(returnNo));
         if (order == null) throw notFound("退货单不存在");
         if (!COMPLETED.equals(order.getStatus())) throw conflict("退货单尚未完成签收");
+        String fileScope = norm(request.fileScope());
+        if (!Set.of("CARTON_TOTAL", "SKU_TOTAL").contains(fileScope)) throw badRequest("贴标总文件类型必须为 CARTON_TOTAL 或 SKU_TOTAL");
         String key = text(request.idempotencyKey());
+        String requestHash = hash(request);
         RelabelApplication replay = relabelApplications.findKey(customerId, key);
-        if (replay != null) return new ReturnOrderResponses.RelabelCreated(replay.getRelabelNo(), replay.getId(), order.getReturnNo(), request.cartonMarks(), replay.getStatus());
-        List<ReturnInventoryCarton> selected = new ArrayList<>();
+        if (replay != null) return new ReturnOrderResponses.RelabelCreated(replay.getRelabelNo(), replay.getId(),
+            order.getReturnNo(), request.items().stream().map(ReturnOrderRequests.RelabelItem::skuCode).toList(), replay.getStatus());
+        if (text(order.getRelabelNo()) != null) throw conflict("当前退货单已经生成贴标申请");
+        var destination = fbaWarehouseValidator.required(request.destinationFbaWarehouseId(), request.destinationFbaWarehouseCode(), null);
+        Map<String, ReturnOrderItem> receivedBySku = orderItems.lockOrder(order.getId()).stream()
+            .collect(java.util.stream.Collectors.toMap(item -> norm(item.getSkuCode()), item -> item));
         Set<String> seen = new LinkedHashSet<>();
-        for (String mark : request.cartonMarks()) {
-            String normalized = text(mark);
-            if (!seen.add(normalized.toUpperCase(java.util.Locale.ROOT))) throw badRequest("箱唛不能重复");
-            ReturnInventoryCarton carton = cartons.findCustomerMark(customerId, normalized);
-            if (carton == null || !order.getOverseasWarehouseId().equals(carton.getOverseasWarehouseId())) throw notFound("退货箱不存在: " + normalized);
-            if (!ReturnInventoryService.AVAILABLE.equals(carton.getStatus()) || carton.getRelabelApplicationId() != null) throw conflict("退货箱不可申请换标: " + normalized);
-            if (carton.getSourceReturnNo() == null || !java.util.Arrays.asList(carton.getSourceReturnNo().split(",")).contains(order.getReturnNo())) throw conflict("退货箱不属于当前退货单: " + normalized);
-            selected.add(cartons.lockMark(normalized));
+        long totalQuantity = 0;
+        for (ReturnOrderRequests.RelabelItem requested : request.items()) {
+            String sku = norm(requested.skuCode());
+            if (!seen.add(sku)) throw badRequest("同一贴标申请不能重复选择 SKU: " + requested.skuCode());
+            ReturnOrderItem received = receivedBySku.get(sku);
+            if (received == null || requested.quantity() > value(received.getReceivedQuantity())) {
+                throw conflict("SKU " + requested.skuCode() + " 的贴标数量超过当前退货单实收数量");
+            }
+            totalQuantity = Math.addExact(totalQuantity, requested.quantity());
         }
         long appId = IdWorker.getId(); LocalDateTime now = LocalDateTime.now();
         String relabelNo = numbers.next("RELABEL", order.getOverseasWarehouseId(), appId);
-        LastlegOrder tail = new LastlegOrder(); tail.setId(IdWorker.getId()); tail.setOrderNo(numbers.next("RELABEL", order.getOverseasWarehouseId(), tail.getId()));
-        tail.setCustomerId(customerId); tail.setOrderType("RELABEL_APPLICATION"); tail.setSourceRegion("CUSTOMER"); tail.setSourceOrderId(String.valueOf(appId)); tail.setSourceOrderNo(relabelNo);
-        tail.setOverseasWarehouseId(order.getOverseasWarehouseId()); tail.setCurrentStatus("PENDING_ASSIGNMENT"); tail.setSubOrderStatus("RELABEL:RETURN_CARTON"); tail.setRelabelStatus("RETURN_CARTON"); tail.setPackageCount(selected.size());
-        tail.setProductQuantity(Math.toIntExact(selected.stream().mapToLong(c -> value(c.getTotalQuantity())).sum())); tail.setCreatedAt(now); tail.setUpdatedAt(now); lastlegOrders.insert(tail);
-        RelabelApplication app = new RelabelApplication(); app.setId(appId); app.setCustomerId(customerId); app.setRelabelNo(relabelNo); app.setLastlegOrderId(tail.getId());
-        app.setCustomerOrderNo(order.getReturnNo()); app.setOverseasWarehouseId(order.getOverseasWarehouseId()); app.setContactName(text(request.contactName())); app.setContactPhone(text(request.contactPhone())); app.setDeliveryMethod(text(request.deliveryMethod()) == null ? "TRUCK" : text(request.deliveryMethod()));
-        app.setFulfillmentStatus("WAIT_RELABEL"); app.setRemark(text(request.remark())); app.setStatus("PENDING_PROCESSING"); app.setItemCount(selected.size()); app.setTotalPackageCount(selected.size()); app.setNotifiedPackageCount(selected.size()); app.setChargeAmount(java.math.BigDecimal.ZERO); app.setChargeCurrency("CNY"); app.setWalletStatus("NOT_REQUIRED"); app.setIdempotencyKey(key); app.setRequestHash(hash(request)); app.setCreatedBy(text(operatorId)); app.setCreatedAt(now); app.setUpdatedAt(now); relabelApplications.insert(app);
-        for (ReturnInventoryCarton carton : selected) {
-            for (ReturnInventoryCartonItem ci : cartonItems.listCarton(carton.getId())) {
-                RelabelItem item = new RelabelItem(); item.setId(IdWorker.getId()); item.setApplicationId(appId); item.setCustomerId(customerId); item.setSkuCode(ci.getSkuCode()); item.setProductNameZh(ci.getProductNameZh()); item.setTotalPackageCount(1); item.setNotifiedPackageCount(1); item.setShipmentNo(order.getReturnNo()); item.setCartonMark(carton.getCartonMark()); item.setFbaCartonMark(carton.getFbaCartonMark()); item.setOperationType("CARTON_LABEL"); item.setReturnCartonId(carton.getId()); item.setSourceCartonMark(carton.getCartonMark()); item.setCreatedAt(now); relabelItems.insert(item);
-            }
-            carton.setRelabelApplicationId(appId); carton.setRelabelNo(relabelNo); carton.setRelabelStatus("PENDING"); carton.setStatus("RELABEL_PENDING"); carton.setUpdatedAt(now); cartons.updateById(carton);
+        LastlegOrder tail = order.getLastlegOrderId() == null ? null : lastlegOrders.selectById(order.getLastlegOrderId());
+        if (tail == null) {
+            tail = new LastlegOrder(); tail.setId(IdWorker.getId()); tail.setOrderNo(numbers.next("RELABEL", order.getOverseasWarehouseId(), tail.getId()));
+            tail.setCustomerId(customerId); tail.setOrderType("RELABEL_APPLICATION"); tail.setSourceRegion("CUSTOMER");
+            tail.setSourceInboundId("RETURN_RELABEL:" + relabelNo);
+            tail.setSourceEventId("RETURN_RELABEL:" + relabelNo);
+            tail.setSourceLoadingPlanId("RETURN_RELABEL");
+            tail.setSourcePayloadHash("sha256:" + requestHash);
+            tail.setSourceOrderId(String.valueOf(appId)); tail.setSourceOrderNo(relabelNo);
+            tail.setOverseasWarehouseId(order.getOverseasWarehouseId()); tail.setCurrentStatus("WAIT_RELABEL");
+            tail.setCreatedAt(now); tail.setPackageCount(Math.toIntExact(totalQuantity));
+            tail.setProductQuantity(Math.toIntExact(totalQuantity)); tail.setUpdatedAt(now); lastlegOrders.insert(tail);
         }
-        order.setRelabelNo(relabelNo); order.setRelabelStatus("PENDING_PROCESSING"); orders.updateById(order);
-        return new ReturnOrderResponses.RelabelCreated(relabelNo, appId, order.getReturnNo(), selected.stream().map(ReturnInventoryCarton::getCartonMark).toList(), app.getStatus());
+        // A return relabel application belongs to the already received return tail-leg order.
+        // Do not create a second independent tail order or overwrite the inbound status.
+        tail.setRelabelOrderNo(relabelNo);
+        tail.setRelabelStatus("PENDING_REVIEW");
+        tail.setSubOrderStatus("RETURN_RELABEL:PENDING_REVIEW");
+        tail.setCurrentStatus("RETURN_RELABEL".equals(tail.getOrderType()) ? "INBOUND_COMPLETED" : tail.getCurrentStatus());
+        tail.setPackageCount(Math.toIntExact(totalQuantity));
+        tail.setProductQuantity(Math.toIntExact(totalQuantity));
+        tail.setUpdatedAt(now);
+        lastlegOrders.updateById(tail);
+        RelabelApplication app = new RelabelApplication(); app.setId(appId); app.setCustomerId(customerId); app.setRelabelNo(relabelNo); app.setLastlegOrderId(tail.getId());
+        app.setCustomerOrderNo(order.getReturnNo()); app.setOverseasWarehouseId(order.getOverseasWarehouseId());
+        app.setLabelDeadline(now.plusDays(7));
+        app.setContactName(text(order.getWarehouseContactName())); app.setContactPhone(text(order.getWarehouseContactPhone()));
+        app.setFulfillmentStatus("WAIT_APPROVAL"); app.setRemark(text(request.cartonRemark())); app.setStatus("PENDING_REVIEW"); app.setItemCount(request.items().size()); app.setTotalPackageCount(Math.toIntExact(totalQuantity)); app.setNotifiedPackageCount(Math.toIntExact(totalQuantity)); app.setChargeAmount(java.math.BigDecimal.ZERO); app.setChargeCurrency("CNY"); app.setWalletStatus("NOT_REQUIRED"); app.setIdempotencyKey(key); app.setRequestHash(requestHash); app.setCreatedBy(text(operatorId)); app.setCreatedAt(now); app.setUpdatedAt(now); relabelApplications.insert(app);
+        List<ReturnInventoryCarton> availableCartons = cartons.findAvailable(customerId, order.getOverseasWarehouseId());
+        Map<Long, ReturnInventoryCarton> selectedCartons = new LinkedHashMap<>();
+        for (ReturnOrderRequests.RelabelItem requested : request.items()) {
+            ReturnOrderItem source = receivedBySku.get(norm(requested.skuCode()));
+            long remaining = requested.quantity();
+            for (ReturnInventoryCarton candidate : availableCartons) {
+                if (remaining == 0) break;
+                if (!order.getReturnNo().equals(candidate.getSourceReturnNo())) continue;
+                long skuQuantity = cartonItems.listCarton(candidate.getId()).stream()
+                    .filter(line -> norm(requested.skuCode()).equals(norm(line.getSkuCode())))
+                    .mapToLong(line -> value(line.getQuantity())).sum();
+                if (skuQuantity <= 0) continue;
+                ReturnInventoryCarton carton = selectedCartons.computeIfAbsent(candidate.getId(), ignored -> cartons.lockId(candidate.getId()));
+                if (carton == null || !"AVAILABLE".equals(carton.getStatus()) || carton.getRelabelApplicationId() != null)
+                    throw conflict("退货箱已被其他换标申请占用，请刷新后重试");
+                long allocated = Math.min(remaining, skuQuantity);
+                RelabelItem item = new RelabelItem(); item.setId(IdWorker.getId()); item.setApplicationId(appId); item.setCustomerId(customerId);
+                item.setSkuCode(source.getSkuCode());
+                item.setProductNameZh(text(source.getProductNameZh()) == null ? source.getSkuCode() : text(source.getProductNameZh()));
+                item.setTotalPackageCount(Math.toIntExact(allocated)); item.setNotifiedPackageCount(Math.toIntExact(allocated));
+                item.setShipmentNo(order.getReturnNo()); item.setLabelRequirement(text(request.cartonRemark()));
+                item.setDestinationWarehouseId(String.valueOf(destination.id())); item.setDestinationFbaWarehouseCode(destination.code());
+                item.setOperationType("RETURN_BULK_SKU_LABEL"); item.setReturnCartonId(carton.getId());
+                item.setCartonMark(carton.getCartonMark()); item.setSourceCartonMark(carton.getCartonMark());
+                item.setCreatedAt(now); relabelItems.insert(item);
+                remaining -= allocated;
+            }
+            if (remaining > 0) throw conflict("退货 SKU 可用实收数量不足: " + requested.skuCode());
+        }
+        for (ReturnInventoryCarton carton : selectedCartons.values()) {
+            carton.setRelabelApplicationId(appId); carton.setRelabelNo(relabelNo); carton.setRelabelStatus("PENDING");
+            carton.setStatus("RELABEL_PENDING"); carton.setUpdatedAt(now); cartons.updateById(carton);
+        }
+        order.setRelabelApplicationId(appId); order.setRelabelNo(relabelNo); order.setRelabelStatus("PENDING_REVIEW"); orders.updateById(order);
+        return new ReturnOrderResponses.RelabelCreated(relabelNo, appId, order.getReturnNo(),
+            request.items().stream().map(ReturnOrderRequests.RelabelItem::skuCode).toList(), app.getStatus());
     }
 
     @Transactional(readOnly = true)
     public PdaReturnReceiptResponses.Start start(PdaWarehouseIdentity identity, PdaReturnReceiptRequests.Start request) {
         ReturnOrder order = activeOrder(String.valueOf(identity.overseasWarehouseId()), request.returnNo());
+        List<PdaReturnReceiptResponses.CompletedPallet> completedPallets = receipts.listOrder(order.getId()).stream()
+            .filter(receipt -> text(receipt.getPalletCode()) != null)
+            .collect(java.util.stream.Collectors.toMap(ReturnReceipt::getPalletCode, receipt -> {
+                ReturnInventoryCarton carton = cartons.findReceipt(receipt.getId());
+                ReturnInventoryCartonItem item = carton == null ? null : cartonItems.listCarton(carton.getId()).stream().findFirst().orElse(null);
+                return new PdaReturnReceiptResponses.CompletedPallet(receipt.getPalletCode(), item == null ? "" : item.getSkuCode(),
+                    item == null ? 0 : value(item.getQuantity()), receipt.getReceiptBatchNo());
+            }, (left, right) -> new PdaReturnReceiptResponses.CompletedPallet(left.palletCode(), left.skuCode(),
+                left.quantity() + right.quantity(), right.receiptBatchNo()), java.util.LinkedHashMap::new))
+            .values().stream().toList();
+        List<PdaReturnReceiptResponses.Photo> photos = photoList(order).stream()
+            .map(file -> new PdaReturnReceiptResponses.Photo(file.fileId(), file.fileName(), file.contentType(), file.sizeBytes())).toList();
         return new PdaReturnReceiptResponses.Start(order.getReturnNo(), order.getStatus(), orderItems.listOrder(order.getId()).stream()
-            .filter(item -> value(item.getReceivedQuantity()) < value(item.getExpectedQuantity())).map(this::pdaItem).toList());
+            .filter(item -> value(item.getReceivedQuantity()) < value(item.getExpectedQuantity())).map(this::pdaItem).toList(), completedPallets, photos);
+    }
+
+    @Transactional(readOnly = true)
+    public com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway.DownloadedFile downloadPhoto(PdaWarehouseIdentity identity, String returnNo, long fileId) {
+        ReturnOrder order = activeOrder(String.valueOf(identity.overseasWarehouseId()), returnNo);
+        return photoFiles.download(order.getCustomerId(), order.getId(), fileId);
     }
 
     @Transactional(readOnly = true)
@@ -255,6 +403,16 @@ public class ReturnReceiptService {
         return new PdaReturnReceiptResponses.SkuCandidates(skuCode, candidates);
     }
 
+    @Transactional
+    public ReturnOrderResponses.Detail manualComplete(PdaWarehouseIdentity identity, String returnNo, PdaReturnReceiptRequests.ManualComplete request) {
+        ReturnOrder order = activeOrder(String.valueOf(identity.overseasWarehouseId()), returnNo);
+        if (value(order.getReceivedQuantity()) >= value(order.getExpectedQuantity())) throw conflict("退货单已按预期数量签收完成，不需要手动完结");
+        order.setStatus("COMPLETED_WITH_DISCREPANCY"); order.setDiscrepancyReason(text(request.discrepancyReason()));
+        order.setManuallyCompletedAt(LocalDateTime.now()); order.setUpdatedAt(LocalDateTime.now()); orders.updateById(order);
+        syncReturnTail(order, "INBOUND_COMPLETED", true);
+        return detail(order.getCustomerId(), order.getReturnNo());
+    }
+
     @Transactional
     public PdaReturnReceiptResponses.Confirmed confirm(PdaWarehouseIdentity identity, PdaReturnReceiptRequests.Confirm request) {
         String key = text(request.idempotencyKey());
@@ -289,6 +447,7 @@ public class ReturnReceiptService {
         receipt.setReceiptNo(numbers.next("RETURN_RECEIPT", order.getOverseasWarehouseId(), receiptId));
         receipt.setReceiptBatchNo(numbers.next("RETURN_BATCH", order.getOverseasWarehouseId(), receiptId));
         receipt.setTrackingNo(trackingNo); receipt.setBoundBy(startedBy); receipt.setStatus("SIGNED");
+        receipt.setPalletCode(text(request.palletCode()));
         receipt.setReceivedQuantity(receiptQuantity); receipt.setOperatorId(identity.operatorKey());
         receipt.setOperatorName(identity.operatorName()); receipt.setIdempotencyKey(key); receipt.setRequestHash(requestHash);
         receipt.setSignedAt(now); receipt.setCreatedAt(now);
@@ -315,13 +474,20 @@ public class ReturnReceiptService {
                 left.skuCode(), left.productNameZh() == null ? right.productNameZh() : left.productNameZh(),
                 Math.addExact(left.quantity(), right.quantity())));
         }
-        receipt.setCartonMark(inventory.createReceiptCarton(order, receipt, request.cartonMark(),
+        if (allocations.stream().map(allocation -> allocation.item().getSkuCode()).distinct().count() != 1) {
+            throw conflict("一个签收批次只能签收一个 SKU");
+        }
+        receipt.setCartonMark(inventory.createReceiptCarton(order, receipt, text(request.palletCode()),
             new ArrayList<>(inventoryLines.values())).getCartonMark());
         receipts.updateById(receipt);
         List<ReturnOrderItem> finalItems = orderItems.listOrder(order.getId());
         long received = finalItems.stream().mapToLong(item -> value(item.getReceivedQuantity())).sum();
         boolean completed = finalItems.stream().allMatch(item -> value(item.getReceivedQuantity()) == value(item.getExpectedQuantity()));
+        if (completed && photoFiles != null && photoList(order).isEmpty()) {
+            throw conflict("本次将完成签收，请先拍摄并上传退货打托照片");
+        }
         order.setReceivedQuantity(received); order.setStatus(completed ? COMPLETED : PARTIALLY_RECEIVED); order.setUpdatedAt(now); orders.updateById(order);
+        syncReturnTail(order, completed ? "INBOUND_COMPLETED" : "PARTIALLY_RECEIVED", completed || received > 0);
         ReturnReceiptBatch batch = new ReturnReceiptBatch();
         batch.setId(IdWorker.getId()); batch.setReturnOrderId(order.getId()); batch.setReceiptId(receiptId);
         batch.setCustomerId(order.getCustomerId()); batch.setBatchNo(receipt.getReceiptBatchNo());
@@ -330,6 +496,21 @@ public class ReturnReceiptService {
         return confirmed(order, receipt, completed);
     }
 
+    private void syncReturnTail(ReturnOrder order, String currentStatus, boolean inboundStarted) {
+        if (order.getLastlegOrderId() == null) return;
+        LastlegOrder tail = lastlegOrders.selectById(order.getLastlegOrderId());
+        if (tail == null) return;
+        tail.setCurrentStatus(currentStatus);
+        tail.setSubOrderStatus("RETURN_RELABEL:" + currentStatus);
+        tail.setRelabelStatus(Boolean.TRUE.equals(order.getNeedRelabel()) && inboundStarted ? "PENDING_PROCESSING" : "NOT_REQUIRED");
+        tail.setUpdatedAt(LocalDateTime.now());
+        lastlegOrders.updateById(tail);
+    }
+
+    private List<RelabelPhotoFileGateway.UploadedFile> photoList(ReturnOrder order) {
+        return photoFiles == null ? List.of() : photoFiles.list(order.getCustomerId(), order.getId());
+    }
+
     private ReturnOrder activeOrder(String warehouseId, String returnNo) {
         ReturnOrder order = orders.findActiveNo(warehouseId, text(returnNo));
         if (order == null) throw notFound("当前仓没有待签收或签收中的退货单");
@@ -367,13 +548,13 @@ public class ReturnReceiptService {
         return confirmed(order, receipt, COMPLETED.equals(order.getStatus()));
     }
     private PdaReturnReceiptResponses.Confirmed confirmed(ReturnOrder order, ReturnReceipt receipt, boolean completed) {
-        return new PdaReturnReceiptResponses.Confirmed(order.getReturnNo(), receipt.getReceiptNo(), receipt.getReceiptBatchNo(), receipt.getCartonMark(),
+        return new PdaReturnReceiptResponses.Confirmed(order.getReturnNo(), receipt.getReceiptNo(), receipt.getReceiptBatchNo(), receipt.getPalletCode(),
             order.getStatus(), completed, value(order.getExpectedQuantity()), value(order.getReceivedQuantity()), receipt.getSignedAt());
     }
     private ReturnOrderResponses.Summary summary(ReturnOrder order) { return new ReturnOrderResponses.Summary(order.getReturnNo(), order.getLastlegOrderNo(),
         order.getOverseasWarehouseId(), order.getWarehouseContactName(), order.getWarehouseContactPhone(), order.getCustomerReferenceNo(), order.getStatus(),
         order.getExpectedSkuTypes() == null ? 0 : order.getExpectedSkuTypes(), value(order.getExpectedQuantity()),
-        value(order.getReceivedQuantity()), Boolean.TRUE.equals(order.getNeedRelabel()), order.getRelabelNo(), order.getRelabelStatus(), order.getCreatedAt()); }
+        value(order.getReceivedQuantity()), Boolean.TRUE.equals(order.getNeedRelabel()), order.getRelabelNo(), order.getRelabelStatus(), order.getDiscrepancyReason(), order.getCreatedAt()); }
     private ReturnOrderResponses.Item item(ReturnOrderItem item) { return new ReturnOrderResponses.Item(item.getSkuCode(),
         item.getProductNameZh(), value(item.getExpectedQuantity()), value(item.getReceivedQuantity())); }
     private PdaReturnReceiptResponses.Item pdaItem(ReturnOrderItem item) { return new PdaReturnReceiptResponses.Item(item.getSkuCode(),
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/service/FbaWarehouseValidator.java b/lastleg-service/src/main/java/com/baiyue/lastleg/service/FbaWarehouseValidator.java
index 5dd39f930..ae1f7364f 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/service/FbaWarehouseValidator.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/service/FbaWarehouseValidator.java
@@ -33,7 +33,7 @@ public class FbaWarehouseValidator {
             || !"FBA".equals(warehouse.warehouseType())
             || !"ACTIVE".equals(warehouse.status())
             || !same(requestedCode, warehouse.warehouseCode())
-            || !same(requestedName, warehouse.warehouseName())) {
+            || !sameIfProvided(requestedName, warehouse.warehouseName())) {
             throw invalid();
         }
         String region = firstRegion(response.data().addresses());
@@ -69,6 +69,10 @@ public class FbaWarehouseValidator {
             && requested.trim().equals(actual.trim());
     }
 
+    private boolean sameIfProvided(String requested, String actual) {
+        return !StringUtils.hasText(requested) || same(requested, actual);
+    }
+
     private String firstRegion(List<DomesticWarehouseDirectoryClient.Address> addresses) {
         if (addresses == null) return null;
         return addresses.stream().filter(Objects::nonNull)
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java
index 2d5cec2a7..ac35f3220 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/transfer/service/WarehouseTransferService.java
@@ -478,6 +478,14 @@ public class WarehouseTransferService {
                 orderDetails.updateById(detail);
             }
             syncInboundPlanDestination(customerId, transfer);
+            if (StringUtils.hasText(transfer.getRelabelNo())) {
+                RelabelApplication relabel = relabelApplications.lockNo(customerId, transfer.getRelabelNo());
+                if (relabel != null && "WAIT_FBA_DESTINATION".equals(relabel.getFulfillmentStatus())) {
+                    relabel.setFulfillmentStatus("WAIT_PRE_DISPATCH");
+                    relabel.setUpdatedAt(now);
+                    relabelApplications.updateById(relabel);
+                }
+            }
             insertOrderHistory(customerId, order.getId(), order.getCurrentStatus(), order.getCurrentStatus(), transferNo,
                 "Warehouse transfer destination bound by " + trim(operatorId), now);
             results.add(new WarehouseTransferResponses.DestinationResult(customerId, transferNo));
@@ -1160,7 +1168,7 @@ public class WarehouseTransferService {
             throw conflict("Source inventory balance is missing for warehouse transfer receipt");
         }
         InventoryCommandResponse result = inventory.stockIn(customerId, operatorId,
-            new InventoryCommandRequests.StockIn(customerId, null,
+            new InventoryCommandRequests.StockIn(customerId, sourceBalance.getCustomerName(),
                 request.destinationOverseasWarehouseId().trim(), trim(request.destinationOverseasWarehouseCode()),
                 trim(request.destinationOverseasWarehouseName()), trim(request.destinationWarehouseId()),
                 request.destinationWarehouseCode().trim(), trim(request.destinationWarehouseName()),
diff --git a/lastleg-service/src/main/resources/db/lastleg.sql b/lastleg-service/src/main/resources/db/lastleg.sql
index 81285ffcb..fd8bfe12e 100644
--- a/lastleg-service/src/main/resources/db/lastleg.sql
+++ b/lastleg-service/src/main/resources/db/lastleg.sql
@@ -1957,6 +1957,7 @@ CREATE TABLE IF NOT EXISTS ll_relabel_pda_unit_fact (
   result VARCHAR(32) NOT NULL COMMENT '逐件结果：RELABELLED、SKIPPED或EXCEPTION',
   exception_code VARCHAR(32) NULL COMMENT '异常编码',
   reason VARCHAR(1000) NULL COMMENT '跳过或异常原因',
+  quantity INT NOT NULL DEFAULT 1 COMMENT '本次事实处理件数，箱级作业固定为1',
   operator_key VARCHAR(128) NOT NULL COMMENT '操作账号标识',
   operator_name VARCHAR(255) NOT NULL COMMENT '操作员名称快照',
   occurred_at DATETIME(3) NOT NULL COMMENT '逐件事实发生时间',
@@ -1965,6 +1966,8 @@ CREATE TABLE IF NOT EXISTS ll_relabel_pda_unit_fact (
   KEY idx_ll_relabel_pda_unit_task (customer_id,task_id,occurred_at,id),
   KEY idx_ll_relabel_pda_unit_item (customer_id,application_id,item_id)
 ) ENGINE=InnoDB COMMENT='海外PDA逐件换标扫码与异常事实';
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_relabel_pda_unit_fact' AND column_name='quantity'), 'SELECT 1', 'ALTER TABLE ll_relabel_pda_unit_fact ADD COLUMN quantity INT NOT NULL DEFAULT 1 COMMENT ''本次事实处理件数，箱级作业固定为1'' AFTER reason'));
+PREPARE ll_relabel_fact_quantity_stmt FROM @ddl; EXECUTE ll_relabel_fact_quantity_stmt; DEALLOCATE PREPARE ll_relabel_fact_quantity_stmt;
 
 CREATE TABLE IF NOT EXISTS ll_relabel_pda_operation (
   id BIGINT NOT NULL COMMENT '换标PDA幂等操作ID',
@@ -2616,6 +2619,8 @@ SET @ll_return_receipt_alter = 'ALTER TABLE ll_return_receipt MODIFY COLUMN trac
 PREPARE ll_return_receipt_alter_stmt FROM @ll_return_receipt_alter;
 EXECUTE ll_return_receipt_alter_stmt;
 DEALLOCATE PREPARE ll_return_receipt_alter_stmt;
+SET @ll_return_receipt_add_pallet = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_receipt' AND column_name='pallet_code'), 'SELECT 1', 'ALTER TABLE ll_return_receipt ADD COLUMN pallet_code VARCHAR(128) NULL COMMENT ''本次签收绑定的托盘码'' AFTER receipt_batch_no'));
+PREPARE ll_return_receipt_add_pallet_stmt FROM @ll_return_receipt_add_pallet; EXECUTE ll_return_receipt_add_pallet_stmt; DEALLOCATE PREPARE ll_return_receipt_add_pallet_stmt;
 CREATE TABLE IF NOT EXISTS ll_return_receipt_item (
  id BIGINT NOT NULL COMMENT '签收SKU明细ID', receipt_id BIGINT NOT NULL COMMENT 'PDA退货签收单ID', return_order_item_id BIGINT NOT NULL COMMENT '退货预报明细ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', sku_code VARCHAR(128) NOT NULL COMMENT 'SKU编码', received_quantity BIGINT NOT NULL COMMENT '本次SKU实收数量',
  PRIMARY KEY(id), KEY idx_ll_return_receipt_item_receipt(receipt_id), KEY idx_ll_return_receipt_item_order_item(return_order_item_id), CONSTRAINT chk_ll_return_receipt_item_quantity CHECK(received_quantity>0)
@@ -2631,15 +2636,17 @@ PREPARE return_receipt_carton_mark_stmt FROM @ddl; EXECUTE return_receipt_carton
 CREATE TABLE IF NOT EXISTS ll_return_inventory_carton (
  new_carton_mark VARCHAR(255) NULL COMMENT '换标后新箱唛',
  id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '海外仓ID', source_receipt_id BIGINT NULL COMMENT '来源PDA签收单ID', source_batch_no VARCHAR(128) NULL COMMENT '来源签收批次号', carton_mark VARCHAR(128) NOT NULL COMMENT '退货箱号和箱唛编码', status VARCHAR(32) NOT NULL COMMENT 'AVAILABLE可用或MERGED已合箱', sku_types INT NOT NULL COMMENT '箱内SKU种类数', total_quantity BIGINT NOT NULL COMMENT '箱内总件数', length DECIMAL(12,3) NULL COMMENT '箱长CM', width DECIMAL(12,3) NULL COMMENT '箱宽CM', height DECIMAL(12,3) NULL COMMENT '箱高CM', weight DECIMAL(12,3) NULL COMMENT '箱重KG', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间', merged_at DATETIME(3) NULL COMMENT '合箱完成时间',
- PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'))
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'))
 ) ENGINE=InnoDB COMMENT='退货实物库存箱及箱唛';
+SET @ll_return_carton_add_pallet = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='pallet_code'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN pallet_code VARCHAR(128) NULL COMMENT ''签收时绑定的托盘码'' AFTER source_return_no'));
+PREPARE ll_return_carton_add_pallet_stmt FROM @ll_return_carton_add_pallet; EXECUTE ll_return_carton_add_pallet_stmt; DEALLOCATE PREPARE ll_return_carton_add_pallet_stmt;
 -- 已合箱的来源箱保留审计记录，但其箱内库存必须归零；动态 SQL 兼容 Spring 的数据库初始化器。
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity', 'SELECT 1'));
 PREPARE return_inventory_carton_check_drop_stmt FROM @ddl; EXECUTE return_inventory_carton_check_drop_stmt; DEALLOCATE PREPARE return_inventory_carton_check_drop_stmt;
-ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_status', 'SELECT 1'));
 PREPARE return_inventory_carton_status_drop_stmt FROM @ddl; EXECUTE return_inventory_carton_status_drop_stmt; DEALLOCATE PREPARE return_inventory_carton_status_drop_stmt;
-ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'));
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'));
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='source_return_no'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN source_return_no VARCHAR(2000) NULL COMMENT ''来源退货单号'' AFTER source_batch_no'));
 PREPARE return_inventory_carton_return_no_stmt FROM @ddl; EXECUTE return_inventory_carton_return_no_stmt; DEALLOCATE PREPARE return_inventory_carton_return_no_stmt;
 ALTER TABLE ll_return_inventory_carton MODIFY COLUMN source_batch_no TEXT NULL COMMENT '实际消耗来源签收批次号，多个批次逗号分隔', MODIFY COLUMN source_return_no TEXT NULL COMMENT '实际消耗来源退货单号，多个单号逗号分隔';
@@ -2679,3 +2686,8 @@ CREATE TABLE IF NOT EXISTS ll_container_loading_evidence (
  UNIQUE KEY uk_ll_container_loading_evidence_type(source_container_booking_id,evidence_type),
  UNIQUE KEY uk_ll_container_loading_evidence_file(source_container_booking_id,source_file_id)
 ) ENGINE=InnoDB COMMENT='海外拆柜只读国内装柜照片引用';
+
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='discrepancy_reason'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN discrepancy_reason VARCHAR(500) NULL COMMENT ''手动完结差异原因'' AFTER remark'));
+PREPARE ll_return_order_discrepancy_stmt FROM @ddl; EXECUTE ll_return_order_discrepancy_stmt; DEALLOCATE PREPARE ll_return_order_discrepancy_stmt;
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_order' AND column_name='manually_completed_at'), 'SELECT 1', 'ALTER TABLE ll_return_order ADD COLUMN manually_completed_at DATETIME(3) NULL COMMENT ''手动差异完结时间'' AFTER discrepancy_reason'));
+PREPARE ll_return_order_manual_completed_stmt FROM @ddl; EXECUTE ll_return_order_manual_completed_stmt; DEALLOCATE PREPARE ll_return_order_manual_completed_stmt;
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxServiceTest.java
index 2d119917d..679162bc0 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/delivery/service/DeliveryCompletedOutboxServiceTest.java
@@ -66,6 +66,40 @@ class DeliveryCompletedOutboxServiceTest {
         verifyNoInteractions(mapper);
     }
 
+    @Test
+    void skipsWarehouseTransferWithoutDomesticSourceOrder() {
+        LastlegEventOutboxMapper mapper = mock(LastlegEventOutboxMapper.class);
+        DeliveryCompletedOutboxService service = new DeliveryCompletedOutboxService();
+        ReflectionTestUtils.setField(service, "outbox", mapper);
+        ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper().registerModule(new JavaTimeModule()));
+        DeliveryOrder delivery = new DeliveryOrder();
+        delivery.setId(2L); delivery.setDeliveryNo("DL-WT"); delivery.setVersion(1L);
+        LastlegOrder transfer = new LastlegOrder();
+        transfer.setId(22L); transfer.setOrderType("WAREHOUSE_TRANSFER");
+        transfer.setCustomerId("88"); transfer.setSourceInboundId("WAREHOUSE_TRANSFER:WT-1");
+
+        service.publish(delivery, List.of(transfer), Instant.parse("2026-09-15T08:00:00Z"));
+
+        verifyNoInteractions(mapper);
+    }
+
+    @Test
+    void skipsOverseasLocalOrderWithoutDomesticSourceOrder() {
+        LastlegEventOutboxMapper mapper = mock(LastlegEventOutboxMapper.class);
+        DeliveryCompletedOutboxService service = new DeliveryCompletedOutboxService();
+        ReflectionTestUtils.setField(service, "outbox", mapper);
+        ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper().registerModule(new JavaTimeModule()));
+        DeliveryOrder delivery = new DeliveryOrder();
+        delivery.setId(3L); delivery.setDeliveryNo("DL-LOCAL"); delivery.setVersion(1L);
+        LastlegOrder local = new LastlegOrder();
+        local.setId(23L); local.setOrderType("RETURN_RELABEL"); local.setSourceRegion("CUSTOMER");
+        local.setCustomerId("88"); local.setSourceInboundId("RETURN-1");
+
+        service.publish(delivery, List.of(local), Instant.parse("2026-09-15T08:00:00Z"));
+
+        verifyNoInteractions(mapper);
+    }
+
     private LastlegOrder order(long id, String inboundId, String orderId, String inboundCode, String fba) {
         LastlegOrder value = new LastlegOrder();
         value.setId(id); value.setOrderNo("LM-" + id); value.setCustomerId("88");
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/controller/PdaPalletOperationControllerContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/controller/PdaPalletOperationControllerContractTest.java
index f074a326d..c621ded0d 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/controller/PdaPalletOperationControllerContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/controller/PdaPalletOperationControllerContractTest.java
@@ -1,6 +1,8 @@
 package com.baiyue.lastleg.palletops.controller;
 
+import com.baiyue.lastleg.palletops.dto.PalletOperationResponses;
 import com.baiyue.lastleg.palletops.mapper.PdaPalletOperationMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.ibatis.annotations.Select;
 import org.junit.jupiter.api.Test;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -8,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.lang.reflect.Method;
+import java.util.List;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -35,4 +38,21 @@ class PdaPalletOperationControllerContractTest {
         assertFalse(sql.contains("&lt;"));
         assertFalse(sql.contains("&gt;"));
     }
+
+    @Test void relabelSourceAndResolvedPalletSerializeSnowflakeIdsAsStrings() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        var source = new PalletOperationResponses.RelabelSource(2100204001227157507L, 2L,
+            2100203890682015746L, "PLT-1", "LOC-1", "IN-1", 1L, 1L, List.of("C-1"));
+        var content = new PalletOperationResponses.PalletContent(2100203890682015746L, "PLT-1",
+            "OCCUPIED", 1, 2092783373163335682L, "LOC-1", null, 1L, List.of());
+
+        assertEquals("2100204001227157507", mapper.readTree(mapper.writeValueAsString(source))
+            .path("positionId").textValue());
+        assertEquals("2100203890682015746", mapper.readTree(mapper.writeValueAsString(source))
+            .path("palletId").textValue());
+        assertEquals("2100203890682015746", mapper.readTree(mapper.writeValueAsString(content))
+            .path("palletId").textValue());
+        assertEquals("2092783373163335682", mapper.readTree(mapper.writeValueAsString(content))
+            .path("locationId").textValue());
+    }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGatewayTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGatewayTest.java
index a2ea91b5f..fbed131ed 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGatewayTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/gateway/HttpPalletPhysicalGatewayTest.java
@@ -9,6 +9,7 @@ import org.springframework.web.client.RestClient;
 import org.springframework.web.server.ResponseStatusException;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
@@ -37,4 +38,23 @@ class HttpPalletPhysicalGatewayTest {
             .hasMessageContaining("404");
         server.verify();
     }
+
+    @Test
+    void resolveIgnoresNewWarehousePalletMetadata() {
+        server.expect(requestTo("http://warehouse/internal/v1/warehouse-pallets/resolve/PAL-1"))
+            .andRespond(withSuccess("""
+                {"code":"200","message":"success","data":{"palletId":"30","palletCode":"PAL-1",
+                "warehouseId":"88","locationId":"40","status":"IDLE","fbaWarehouseCode":"XLX1",
+                "unitPrice":1.00,"version":2,"locationType":"VIRTUAL","locationStatus":"ACTIVE",
+                "reservable":true,"reservationBlockReason":null},
+                "timestamp":"2026-09-19T03:18:35.283336500Z"}
+                """, MediaType.APPLICATION_JSON));
+
+        var result = gateway.resolve("PAL-1");
+
+        assertThat(result.palletId()).isEqualTo(30L);
+        assertThat(result.palletCode()).isEqualTo("PAL-1");
+        assertThat(result.fbaWarehouseCode()).isEqualTo("XLX1");
+        server.verify();
+    }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
index 7743d3207..6ff734011 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
@@ -18,6 +18,11 @@ import com.baiyue.lastleg.relabel.entity.RelabelItem;
 import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
 import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
 import com.baiyue.lastleg.relabel.service.RelabelPalletMutationService;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryBalanceMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -62,6 +67,9 @@ class PdaPalletOperationServiceTest {
     @Mock private RelabelApplicationMapper relabelApplications;
     @Mock private RelabelItemMapper relabelItems;
     @Mock private RelabelPalletMutationService relabelPalletMutations;
+    @Mock private ReturnInventoryCartonMapper returnCartons;
+    @Mock private ReturnInventoryCartonItemMapper returnCartonItems;
+    @Mock private ReturnInventoryBalanceMapper returnBalances;
     private PdaPalletOperationService service;
 
     @BeforeEach void setUp() {
@@ -75,10 +83,44 @@ class PdaPalletOperationServiceTest {
         ReflectionTestUtils.setField(service, "relabelApplications", relabelApplications);
         ReflectionTestUtils.setField(service, "relabelItems", relabelItems);
         ReflectionTestUtils.setField(service, "relabelPalletMutations", relabelPalletMutations);
+        ReflectionTestUtils.setField(service, "returnCartons", returnCartons);
+        ReflectionTestUtils.setField(service, "returnCartonItems", returnCartonItems);
+        ReflectionTestUtils.setField(service, "returnBalances", returnBalances);
         ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper().findAndRegisterModules());
         service.configureTransactions(new NoOpTransactionManager());
     }
 
+    @Test void partialReturnRelabelKeepsUnlabelledRemainderOnOriginalPallet() {
+        RelabelApplication app = new RelabelApplication(); app.setId(600L); app.setCustomerId("100"); app.setRelabelNo("RL-1");
+        RelabelItem item = new RelabelItem(); item.setId(701L); item.setSkuCode("SKU-1");
+        item.setReturnCartonId(801L); item.setDestinationFbaWarehouseCode("XLX6");
+        ReturnInventoryCarton original = new ReturnInventoryCarton(); original.setId(801L);
+        original.setCustomerId("100"); original.setOverseasWarehouseId("88");
+        original.setTotalQuantity(100L); original.setPalletCode("OLD");
+        ReturnInventoryCartonItem originalLine = new ReturnInventoryCartonItem();
+        originalLine.setId(901L); originalLine.setSkuCode("SKU-1"); originalLine.setQuantity(100L);
+        when(relabelItems.selectList(any())).thenReturn(List.of(item));
+        when(returnCartonItems.lockCarton(801L)).thenReturn(List.of(originalLine));
+        when(returnCartonItems.updateById(any(ReturnInventoryCartonItem.class))).thenReturn(1);
+        when(returnCartons.releasePartial(801L, "100", 600L, 70L)).thenReturn(1);
+        when(returnCartons.insert(any(ReturnInventoryCarton.class))).thenReturn(1);
+        when(returnCartonItems.insert(any(ReturnInventoryCartonItem.class))).thenReturn(1);
+        when(returnBalances.adjustCartonQuantity("100", "88", "SKU-1", 1)).thenReturn(1);
+        when(relabelItems.updateById(any(RelabelItem.class))).thenReturn(1);
+
+        ReflectionTestUtils.invokeMethod(service, "splitReturnRelabelCarton", app, item, original,
+            pallet(30L, "NEW-XLX6", 88L, 0), 30L);
+
+        assertEquals(70L, originalLine.getQuantity());
+        var moved = ArgumentCaptor.forClass(ReturnInventoryCarton.class);
+        verify(returnCartons).insert(moved.capture());
+        assertEquals(30L, moved.getValue().getTotalQuantity());
+        assertEquals("NEW-XLX6", moved.getValue().getPalletCode());
+        assertEquals("XLX6", moved.getValue().getDestinationWarehouseCode());
+        assertEquals(moved.getValue().getId(), item.getReturnCartonId());
+        verify(returnBalances).adjustCartonQuantity("100", "88", "SKU-1", 1);
+    }
+
     @Test void resolveRejectsPalletOutsideTokenFrozenWarehouse() {
         when(physical.resolve("P-1")).thenReturn(pallet(10L, "P-1", 99L, 1));
         assertThrows(ResponseStatusException.class, () -> service.resolve(identity(),
@@ -100,7 +142,7 @@ class PdaPalletOperationServiceTest {
         RelabelApplication application = new RelabelApplication(); application.setRelabelNo("RL-1");
         application.setStatus("READY_FOR_OUTBOUND"); application.setOverseasWarehouseId("88");
         when(relabelApplications.findAnyByRelabelNo("RL-1")).thenReturn(application);
-        when(physical.ensureRelabelPallet(88L, "RL-1:new-pallet-1")).thenReturn(
+        when(physical.ensureRelabelPallet(88L, "RL-1:new-pallet-1", null)).thenReturn(
             new PalletPhysicalGateway.PalletReference(30L, "PAL-NEW-1", 88L, 1030L, "IDLE", null, 0));
 
         var result = service.createRelabelPallet(identity(),
@@ -358,6 +400,27 @@ class PdaPalletOperationServiceTest {
         assertEquals(java.util.Set.of(), ReflectionTestUtils.invokeMethod(service, "boundRelabelMarks", app));
     }
 
+    @Test void relabelSourcesExposeAuthoritativePalletId() {
+        var tasks = mock(com.baiyue.lastleg.relabel.pda.mapper.PdaRelabelTaskMapper.class);
+        ReflectionTestUtils.setField(service, "relabelWorkTasks", tasks);
+        RelabelApplication app = new RelabelApplication(); app.setId(600L); app.setCustomerId("100");
+        app.setRelabelNo("RL-1"); app.setOverseasWarehouseId("88"); app.setStatus("READY_FOR_OUTBOUND");
+        app.setFulfillmentStatus("WAIT_PRE_DISPATCH");
+        when(relabelApplications.findAnyByRelabelNo("RL-1")).thenReturn(app);
+        RelabelItem item = relabelItem(701L, "CARTON-A", 100L);
+        when(relabelItems.selectList(any())).thenReturn(List.of(item));
+        when(positions.selectById(100L)).thenReturn(position(100L, 20L, "DISPLAY-CODE", 1L, 3L));
+        PalletInventoryRow source = row(100L, 20L, 3L, 0L); source.setPalletNo("CANONICAL-CODE");
+        source.setHoldPackages(1L);
+        when(mapper.relabelSources("100", "88", 200L)).thenReturn(List.of(source));
+
+        var result = service.relabelSources(identity(), new PalletOperationRequests.RelabelSources("RL-1"));
+
+        assertEquals(1, result.size());
+        assertEquals(20L, result.get(0).palletId());
+        assertEquals("CANONICAL-CODE", result.get(0).palletCode());
+    }
+
     @Test void createsPalletBeforeCustomerConfirmationOnlyForClaimingOperator() {
         var tasks = mock(com.baiyue.lastleg.relabel.pda.mapper.PdaRelabelTaskMapper.class);
         ReflectionTestUtils.setField(service, "relabelWorkTasks", tasks);
@@ -366,7 +429,7 @@ class PdaPalletOperationServiceTest {
         when(relabelApplications.findAnyByRelabelNo("RL-1")).thenReturn(app);
         var task = new com.baiyue.lastleg.relabel.pda.entity.PdaRelabelTask(); task.setStatus("PROCESSING"); task.setOperatorKey("7");
         when(tasks.find("100", 600L)).thenReturn(task);
-        when(physical.ensureRelabelPallet(88L, "RL-1:before-confirm")).thenReturn(pallet(30L, "NEW", 88L, 0));
+        when(physical.ensureRelabelPallet(88L, "RL-1:before-confirm", null)).thenReturn(pallet(30L, "NEW", 88L, 0));
         assertEquals("NEW", service.createRelabelPallet(identity(), new PalletOperationRequests.NewRelabelPallet("RL-1", "before-confirm")).palletCode());
         task.setOperatorKey("other");
         assertThrows(ResponseStatusException.class, () -> service.createRelabelPallet(identity(), new PalletOperationRequests.NewRelabelPallet("RL-1", "different")));
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
index 2d9995cf6..6c594354e 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/RelabelContractTest.java
@@ -117,4 +117,20 @@ class RelabelContractTest {
         assertTrue(service.contains("requiresOutbound && (!StringUtils.hasText(deliveryMethod)"
             + " || !DELIVERY_METHODS.contains(deliveryMethod))"));
     }
+
+    @Test
+    void returnRelabelReviewStatusIsProjectedWithoutLosingPendingOrRejectedState() throws Exception {
+        String service = Files.readString(Path.of("src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java"),
+            StandardCharsets.UTF_8);
+        assertTrue(service.contains("Set.of(PENDING_REVIEW, PENDING_PROCESSING, \"PROCESSING\", \"REJECTED\", \"CANCELLED\")"));
+        assertTrue(service.contains("return workflowStatus;"));
+    }
+
+    @Test
+    void returnCartonConstraintsAllowRelabelReservationWithPositiveInventory() throws Exception {
+        String baseline = Files.readString(Path.of("src/main/resources/db/lastleg.sql"), StandardCharsets.UTF_8)
+            .replaceAll("\\s+", "").toUpperCase();
+        assertTrue(baseline.contains("STATUSIN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED')ANDSKU_TYPES>0ANDTOTAL_QUANTITY>0"));
+        assertTrue(baseline.contains("STATUSIN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED')"));
+    }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelServiceTest.java
index b111d41d9..73a870fb3 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/pda/service/PdaRelabelServiceTest.java
@@ -264,6 +264,73 @@ class PdaRelabelServiceTest {
         verify(unitFacts, never()).insert(any(PdaRelabelUnitFact.class));
     }
 
+    @Test
+    void returnSkuTotalCompletesOneSkuOnceAndAllocatesAcrossSourcePalletItems() {
+        application.setStatus("PROCESSING"); application.setNotifiedPackageCount(100);
+        item.setOperationType("RETURN_BULK_SKU_LABEL"); item.setSkuCode("sku-fba100");
+        item.setNotifiedPackageCount(50); item.setCartonMark("PALLET-A");
+        RelabelItem second = item(); second.setId(11L); second.setOperationType("RETURN_BULK_SKU_LABEL");
+        second.setSkuCode("sku-fba100"); second.setNotifiedPackageCount(50); second.setCartonMark("PALLET-B");
+        PdaRelabelTask task = task("PROCESSING", 0); task.setExpectedPackages(100);
+        when(applications.lockAnyByRelabelNo("FBR-1")).thenReturn(application);
+        when(tasks.lock("100", 1L)).thenReturn(task);
+        when(items.selectList(any())).thenReturn(List.of(item, second));
+
+        var result = service.completeReturnSkuTotal("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.BulkSkuTotal("sku-fba100", 100, 0, "sku-total-1"));
+
+        assertEquals(100, result.relabelledPackages());
+        assertEquals(2, persistedFacts.size());
+        assertEquals(List.of(50, 50), persistedFacts.stream().map(PdaRelabelUnitFact::getQuantity).toList());
+        assertEquals(List.of(10L, 11L), persistedFacts.stream().map(PdaRelabelUnitFact::getItemId).toList());
+        assertTrue(persistedFacts.stream().allMatch(fact -> fact.getOldLabel() == null));
+        assertEquals(1, result.version());
+    }
+
+    @Test
+    void multiSkuPartialReturnRelabelRequiresBothSkuTotalsBeforeCompletion() {
+        verifyMultiSkuReturnCompletion(30, 15);
+    }
+
+    @Test
+    void multiSkuFullReturnRelabelRequiresBothSkuTotalsBeforeCompletion() {
+        verifyMultiSkuReturnCompletion(50, 40);
+    }
+
+    private void verifyMultiSkuReturnCompletion(int firstQuantity, int secondQuantity) {
+        application.setStatus("PROCESSING");
+        application.setNotifiedPackageCount(firstQuantity + secondQuantity);
+        item.setOperationType("RETURN_BULK_SKU_LABEL"); item.setSkuCode("SKU-A");
+        item.setNotifiedPackageCount(firstQuantity); item.setCartonMark("RC-A");
+        RelabelItem second = item(); second.setId(11L);
+        second.setOperationType("RETURN_BULK_SKU_LABEL"); second.setSkuCode("SKU-B");
+        second.setNotifiedPackageCount(secondQuantity); second.setCartonMark("RC-B");
+        PdaRelabelTask task = task("PROCESSING", 0);
+        task.setExpectedPackages(firstQuantity + secondQuantity);
+        when(applications.lockAnyByRelabelNo("FBR-1")).thenReturn(application);
+        when(tasks.lock("100", 1L)).thenReturn(task);
+        when(items.selectList(any())).thenReturn(List.of(item, second));
+
+        var first = service.completeReturnSkuTotal("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.BulkSkuTotal("SKU-A", firstQuantity, 0, "multi-a"));
+        assertEquals(firstQuantity, first.relabelledPackages());
+        assertThrows(ResponseStatusException.class, () -> service.complete("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.Complete(List.of(501L), 1, "multi-early", null)));
+        assertThrows(ResponseStatusException.class, () -> service.completeReturnSkuTotal("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.BulkSkuTotal("SKU-A", 1, 1, "multi-over")));
+
+        var both = service.completeReturnSkuTotal("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.BulkSkuTotal("SKU-B", secondQuantity, 1, "multi-b"));
+        assertEquals(firstQuantity + secondQuantity, both.relabelledPackages());
+        assertEquals(List.of("SKU-A", "SKU-B"), persistedFacts.stream()
+            .map(fact -> fact.getItemId().equals(item.getId()) ? "SKU-A" : "SKU-B").toList());
+        assertEquals(List.of(firstQuantity, secondQuantity), persistedFacts.stream()
+            .map(PdaRelabelUnitFact::getQuantity).toList());
+        var completed = service.complete("7", "picker", 900L, "FBR-1",
+            new PdaRelabelRequests.Complete(List.of(501L), 2, "multi-complete", "multi SKU complete"));
+        assertEquals(PdaRelabelService.WAIT_REVIEW, completed.taskStatus());
+    }
+
     @Test
     void completeRequiresEveryUnitAndMovesOnlyPdaTaskToWaitReview() {
         application.setStatus("PROCESSING");
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
index 3c2cdf225..ec07e9bf0 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
@@ -30,6 +30,8 @@ import com.baiyue.lastleg.delivery.mapper.OutboundPalletItemMapper;
 import com.baiyue.lastleg.delivery.mapper.OutboundPdaTaskMapper;
 import com.baiyue.lastleg.transfer.entity.WarehouseTransferOrder;
 import com.baiyue.lastleg.transfer.mapper.WarehouseTransferOrderMapper;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnOrder;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper;
 import com.baiyue.lastleg.financefee.entity.OverseasFeeSource;
 import com.baiyue.lastleg.financefee.service.OverseasFeeSourceService;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -75,6 +77,7 @@ class RelabelApplicationServiceTest {
     @Mock OutboundPdaTaskMapper outboundTasks;
     @Mock WarehouseTransferOrderMapper warehouseTransfers;
     @Mock OverseasFeeSourceService feeSources;
+    @Mock ReturnOrderMapper returnOrders;
     @Mock com.baiyue.lastleg.relabel.pda.mapper.PdaRelabelTaskMapper pdaTasks;
     @Spy LastlegOrderNoGenerator orderNoGenerator = new LastlegOrderNoGenerator();
 
@@ -103,6 +106,7 @@ class RelabelApplicationServiceTest {
         ReflectionTestUtils.setField(service, "outboundItems", outboundItems);
         ReflectionTestUtils.setField(service, "outboundTasks", outboundTasks);
         ReflectionTestUtils.setField(service, "warehouseTransfers", warehouseTransfers);
+        ReflectionTestUtils.setField(service, "returnOrders", returnOrders);
         ReflectionTestUtils.setField(service, "objectMapper", mapper());
         lenient().when(walletCommands.publish(any(), any(Long.class), any(), any(), any(), any(), any(Long.class))).thenReturn("wallet-event-1");
         lenient().when(inventoryPositions.findTenantPosition(any(), any())).thenAnswer(invocation -> {
@@ -411,6 +415,10 @@ class RelabelApplicationServiceTest {
         when(items.selectList(any())).thenReturn(List.of(item(31L, application.getId(), "SKU-A", 1, 1)));
         when(histories.selectList(any())).thenReturn(List.of());
         when(orders.selectById(21L)).thenReturn(order);
+        ReturnOrder returnOrder = new ReturnOrder();
+        returnOrder.setId(41L); returnOrder.setCustomerId("10001");
+        returnOrder.setRelabelApplicationId(application.getId()); returnOrder.setRelabelStatus("PROCESSING");
+        when(returnOrders.selectOne(any())).thenReturn(returnOrder);
 
         service.changeStatus("10001", "FBR-REVIEW", "operator-2",
             new RelabelRequests.ChangeStatus(RelabelApplicationService.CUSTOMER_CONFIRM_PENDING, "submitted"));
@@ -419,6 +427,8 @@ class RelabelApplicationServiceTest {
         assertEquals("WAIT_CUSTOMER_CONFIRMATION", application.getFulfillmentStatus());
         assertEquals("COMPLETED", order.getRelabelStatus());
         assertEquals("RELABEL:CUSTOMER_CONFIRM_PENDING", order.getSubOrderStatus());
+        assertEquals(RelabelApplicationService.CUSTOMER_CONFIRM_PENDING, returnOrder.getRelabelStatus());
+        verify(returnOrders).updateById(returnOrder);
     }
 
     @Test
@@ -558,6 +568,7 @@ class RelabelApplicationServiceTest {
             new RelabelRequests.CustomerConfirm("confirm-transfer", "accepted"));
 
         assertEquals("READY_FOR_DISPATCH", transfer.getStatus());
+        assertEquals("WAIT_PRE_DISPATCH", application.getFulfillmentStatus());
         assertNotNull(transfer.getRelabelCompletedAt());
         assertEquals("READY_FOR_DISPATCH", transferOrder.getCurrentStatus());
         assertEquals("COMPLETED", transferOrder.getRelabelStatus());
@@ -610,6 +621,7 @@ class RelabelApplicationServiceTest {
 
         assertEquals("ONT8", transfer.getFbaWarehouseCode());
         assertEquals("READY_FOR_DISPATCH", transfer.getStatus());
+        assertEquals("WAIT_PRE_DISPATCH", application.getFulfillmentStatus());
         assertEquals("ONT8", transferOrder.getFbaWarehouseCode());
         assertEquals("READY_FOR_DISPATCH", transferOrder.getCurrentStatus());
     }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelReturnCartonCandidateTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelReturnCartonCandidateTest.java
index 36980b2da..163342279 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelReturnCartonCandidateTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelReturnCartonCandidateTest.java
@@ -45,6 +45,7 @@ class RelabelReturnCartonCandidateTest {
         assertEquals("RETURN_CARTON", result.get(0).sourceType());
         assertEquals(9001L, result.get(0).returnCartonId());
         assertEquals("RC-WH-0001", result.get(0).cartonMark());
+        assertEquals(12, result.get(0).availablePackages());
         assertEquals("SKU-RETURN", result.get(0).skuItems().get(0).skuCode());
         assertEquals(12, result.get(0).skuItems().get(0).quantity());
     }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
index d4fa84a86..fab443c9d 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
@@ -4,6 +4,7 @@ import com.baiyue.lastleg.mapper.LastlegOrderMapper;
 import com.baiyue.lastleg.entity.LastlegOrder;
 import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
 import com.baiyue.lastleg.returnreceipt.dto.PdaReturnReceiptRequests;
+import com.baiyue.lastleg.returnreceipt.dto.ReturnOrderRequests;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCarton;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnOrder;
 import com.baiyue.lastleg.returnreceipt.entity.ReturnOrderItem;
@@ -14,6 +15,14 @@ import com.baiyue.lastleg.returnreceipt.mapper.ReturnOrderMapper;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptBatchMapper;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptItemMapper;
 import com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonMapper;
+import com.baiyue.lastleg.returnreceipt.mapper.ReturnInventoryCartonItemMapper;
+import com.baiyue.lastleg.returnreceipt.entity.ReturnInventoryCartonItem;
+import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
+import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
+import com.baiyue.lastleg.relabel.entity.RelabelApplication;
+import com.baiyue.lastleg.relabel.entity.RelabelItem;
+import com.baiyue.lastleg.service.FbaWarehouseValidator;
 import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
@@ -53,6 +62,11 @@ class ReturnReceiptServiceTest {
     @Mock ReturnInventoryService inventory;
     @Mock LastlegOrderNoGenerator numbers;
     @Mock LastlegOrderMapper lastlegOrders;
+    @Mock ReturnInventoryCartonMapper cartons;
+    @Mock ReturnInventoryCartonItemMapper cartonItems;
+    @Mock RelabelApplicationMapper relabelApplications;
+    @Mock RelabelItemMapper relabelItems;
+    @Mock FbaWarehouseValidator fbaWarehouseValidator;
 
     ReturnReceiptService service;
     PdaWarehouseIdentity identity;
@@ -69,9 +83,76 @@ class ReturnReceiptServiceTest {
         ReflectionTestUtils.setField(service, "numbers", numbers);
         ReflectionTestUtils.setField(service, "objectMapper", new ObjectMapper());
         ReflectionTestUtils.setField(service, "lastlegOrders", lastlegOrders);
+        ReflectionTestUtils.setField(service, "cartons", cartons);
+        ReflectionTestUtils.setField(service, "cartonItems", cartonItems);
+        ReflectionTestUtils.setField(service, "relabelApplications", relabelApplications);
+        ReflectionTestUtils.setField(service, "relabelItems", relabelItems);
+        ReflectionTestUtils.setField(service, "fbaWarehouseValidator", fbaWarehouseValidator);
         identity = new PdaWarehouseIdentity("operator-1", "仓管员", 10L);
     }
 
+    @Test
+    void multiSkuPartialRelabelLocksOnlyRequestedQuantities() {
+        verifyMultiSkuRelabel(30, 15);
+    }
+
+    @Test
+    void multiSkuFullRelabelLocksAllReceivedQuantities() {
+        verifyMultiSkuRelabel(50, 40);
+    }
+
+    private void verifyMultiSkuRelabel(long firstQuantity, long secondQuantity) {
+        ReturnOrder order = order("RT-MULTI", "10", "COMPLETED", 90, 90);
+        order.setLastlegOrderId(99L);
+        LastlegOrder tail = new LastlegOrder(); tail.setId(99L);
+        ReturnInventoryCarton first = returnCarton(101L, "RC-A", "P-1", 50);
+        ReturnInventoryCarton second = returnCarton(102L, "RC-B", "P-2", 40);
+        when(orders.findNo("customer-1", "RT-MULTI")).thenReturn(order);
+        when(orderItems.lockOrder(1L)).thenReturn(List.of(item(11L, "SKU-A", 50, 50), item(12L, "SKU-B", 40, 40)));
+        when(fbaWarehouseValidator.required("200", "XLX6", null)).thenReturn(
+            new FbaWarehouseValidator.VerifiedFbaWarehouse(200L, "XLX6", "FBA XLX6", "US", "CA"));
+        when(numbers.next(eq("RELABEL"), eq("10"), anyLong())).thenReturn("RL-MULTI");
+        when(lastlegOrders.selectById(99L)).thenReturn(tail);
+        when(cartons.findAvailable("customer-1", "10")).thenReturn(List.of(first, second));
+        when(cartons.lockId(101L)).thenReturn(first);
+        when(cartons.lockId(102L)).thenReturn(second);
+        when(cartonItems.listCarton(101L)).thenReturn(List.of(returnCartonItem("SKU-A", 50)));
+        when(cartonItems.listCarton(102L)).thenReturn(List.of(returnCartonItem("SKU-B", 40)));
+
+        var result = service.createRelabel("customer-1", "merchant-1", "RT-MULTI",
+            new ReturnOrderRequests.RelabelCreate(List.of(
+                new ReturnOrderRequests.RelabelItem("SKU-A", firstQuantity),
+                new ReturnOrderRequests.RelabelItem("SKU-B", secondQuantity)),
+                "SKU_TOTAL", "200", "XLX6", "multi-key", "multi SKU acceptance"));
+
+        assertEquals("RL-MULTI", result.relabelNo());
+        var application = ArgumentCaptor.forClass(RelabelApplication.class);
+        verify(relabelApplications).insert(application.capture());
+        assertEquals(firstQuantity + secondQuantity, application.getValue().getNotifiedPackageCount().longValue());
+        assertEquals(2, application.getValue().getItemCount());
+        var lines = ArgumentCaptor.forClass(RelabelItem.class);
+        verify(relabelItems, times(2)).insert(lines.capture());
+        assertEquals(List.of("SKU-A", "SKU-B"), lines.getAllValues().stream().map(RelabelItem::getSkuCode).toList());
+        assertEquals(List.of((int) firstQuantity, (int) secondQuantity),
+            lines.getAllValues().stream().map(RelabelItem::getNotifiedPackageCount).toList());
+        assertTrue(lines.getAllValues().stream().allMatch(line -> "RETURN_BULK_SKU_LABEL".equals(line.getOperationType())));
+        assertEquals("RELABEL_PENDING", first.getStatus());
+        assertEquals("RELABEL_PENDING", second.getStatus());
+    }
+
+    private static ReturnInventoryCarton returnCarton(long id, String mark, String pallet, long quantity) {
+        ReturnInventoryCarton carton = new ReturnInventoryCarton();
+        carton.setId(id); carton.setCustomerId("customer-1"); carton.setOverseasWarehouseId("10");
+        carton.setSourceReturnNo("RT-MULTI"); carton.setCartonMark(mark); carton.setPalletCode(pallet);
+        carton.setTotalQuantity(quantity); carton.setStatus("AVAILABLE");
+        return carton;
+    }
+
+    private static ReturnInventoryCartonItem returnCartonItem(String sku, long quantity) {
+        ReturnInventoryCartonItem line = new ReturnInventoryCartonItem();
+        line.setSkuCode(sku); line.setQuantity(quantity); return line;
+    }
+
     @Test
     void startReturnsOnlyRemainingSkuLinesForTheBoundWarehouse() {
         ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PARTIALLY_RECEIVED, 8, 3);
@@ -110,6 +191,26 @@ class ReturnReceiptServiceTest {
         assertEquals("RETU-1", result.order().lastlegOrderNo());
     }
 
+    @Test
+    void rejectingForecastMarksReturnAndLinkedTailAsRejected() {
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PENDING_REVIEW, 2, 0);
+        order.setLastlegOrderId(99L);
+        LastlegOrder tail = new LastlegOrder();
+        tail.setId(99L);
+        when(orders.findNo("customer-1", "RT-1")).thenReturn(order);
+        when(lastlegOrders.selectById(99L)).thenReturn(tail);
+
+        service.review("customer-1", "RT-1", new ReturnOrderRequests.Review("REJECT", "资料不齐"));
+
+        assertEquals("REJECTED", order.getStatus());
+        assertEquals("资料不齐", order.getRemark());
+        assertEquals("REJECTED", tail.getCurrentStatus());
+        assertEquals("RETURN_RELABEL:REJECTED", tail.getSubOrderStatus());
+        assertEquals("REJECTED", tail.getRelabelStatus());
+        verify(orders).updateById(order);
+        verify(lastlegOrders).updateById(tail);
+    }
+
     @Test
     void skuLookupReturnsOnlyActiveCandidatesFromTheBoundWarehouse() {
         ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PENDING_RECEIPT, 5, 1);
@@ -162,7 +263,7 @@ class ReturnReceiptServiceTest {
         ReturnOrder order = order("RT-1", "10", ReturnReceiptService.PARTIALLY_RECEIVED, 2, 1);
         ReturnOrderItem line = item(11L, "SKU-A", 2, 1);
         stubNewReceipt(order, List.of(line), "RC-AUTO");
-        var request = confirm("SKU", null, null, "key-final",
+        var request = confirm("SKU", null, "RC-AUTO", "key-final",
             List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)));
 
         var first = service.confirm(identity, request);
@@ -175,7 +276,7 @@ class ReturnReceiptServiceTest {
         assertTrue(first.fullyMatched());
         assertEquals(ReturnReceiptService.COMPLETED, first.orderStatus());
         assertEquals(first.receiptNo(), replay.receiptNo());
-        assertEquals("RC-AUTO", replay.cartonMark());
+        assertEquals("RC-AUTO", replay.palletCode());
         verify(inventory, times(1)).createReceiptCarton(any(), any(), any(), any());
         verify(batches, times(1)).insert(any(ReturnReceiptBatch.class));
         verify(receipts, times(1)).insert(any(ReturnReceipt.class));
@@ -249,7 +350,7 @@ class ReturnReceiptServiceTest {
         var request = confirm("RETURN_NO", null, null, "concurrent-key", List.of(new PdaReturnReceiptRequests.Item("SKU-A", 1)));
         ReturnOrder completed = order("RT-1", "10", ReturnReceiptService.COMPLETED, 1, 1);
         ReturnReceipt committed = new ReturnReceipt();
-        committed.setReceiptNo("RR-COMMITTED"); committed.setReceiptBatchNo("RB-COMMITTED"); committed.setCartonMark("RC-COMMITTED");
+        committed.setReceiptNo("RR-COMMITTED"); committed.setReceiptBatchNo("RB-COMMITTED"); committed.setPalletCode("RC-COMMITTED");
         committed.setRequestHash(java.util.HexFormat.of().formatHex(java.security.MessageDigest.getInstance("SHA-256")
             .digest(new ObjectMapper().writeValueAsBytes(request))));
         when(orders.lockNo("RT-1")).thenReturn(completed);
@@ -301,8 +402,8 @@ class ReturnReceiptServiceTest {
         return item;
     }
 
-    private static PdaReturnReceiptRequests.Confirm confirm(String startedBy, String trackingNo, String cartonMark,
+    private static PdaReturnReceiptRequests.Confirm confirm(String startedBy, String trackingNo, String palletCode,
                                                              String key, List<PdaReturnReceiptRequests.Item> items) {
-        return new PdaReturnReceiptRequests.Confirm("RT-1", trackingNo, startedBy, cartonMark, items, key);
+        return new PdaReturnReceiptRequests.Confirm("RT-1", trackingNo, startedBy, palletCode, items, key);
     }
 }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
index 1d27139c8..cdc68c071 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/service/FbaWarehouseValidatorTest.java
@@ -46,6 +46,18 @@ class FbaWarehouseValidatorTest {
         assertThat(result.region()).isEqualTo("CA");
     }
 
+    @Test
+    void acceptsMatchingIdAndCodeWhenCallerDoesNotCarryWarehouseName() {
+        when(client.activeWarehouse(193000000000000001L, "internal-token"))
+            .thenReturn(ApiResponse.success(detail("FBA", "ACTIVE", "XLX1", "XLX1")));
+
+        var result = validator.required("193000000000000001", "XLX1", null);
+
+        assertThat(result.id()).isEqualTo(193000000000000001L);
+        assertThat(result.code()).isEqualTo("XLX1");
+        assertThat(result.name()).isEqualTo("XLX1");
+    }
+
     @Test
     void rejectsAnActualOverseasReceivingWarehouseAsFbaDestination() {
         when(client.activeWarehouse(193000000000000001L, "internal-token"))
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferServiceTest.java
index 0f23c0ae3..7ecafb8ee 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferServiceTest.java
@@ -352,6 +352,42 @@ class WarehouseTransferServiceTest {
         assertEquals("WAREHOUSE_PICKUP", transfer.getValue().getDeliveryMethod());
     }
 
+    @Test
+    void bindingDestinationReleasesLinkedRelabelForPreDispatch() {
+        WarehouseTransferOrder transfer = transfer(WarehouseTransferService.WAIT_FBA_DESTINATION);
+        transfer.setNeedRelabel(true);
+        transfer.setRelabelNo("FBR-1");
+        transfer.setFbaWarehouseCode(null);
+        LastlegOrder order = tailOrder();
+        RelabelApplication relabel = new RelabelApplication();
+        relabel.setId(71L);
+        relabel.setCustomerId("TENANT-A");
+        relabel.setRelabelNo("FBR-1");
+        relabel.setFulfillmentStatus("WAIT_FBA_DESTINATION");
+        InboundPlan plan = new InboundPlan();
+        plan.setId(81L);
+
+        when(transfers.lockNo("TENANT-A", "WTR-1")).thenReturn(transfer);
+        when(transfers.findNo("TENANT-A", "WTR-1")).thenReturn(transfer);
+        when(orders.selectById(transfer.getLastlegOrderId())).thenReturn(order);
+        when(orderDetails.selectList(any())).thenReturn(List.of());
+        when(inboundPlans.findBySourceOrder("TENANT-A", transfer.getLastlegOrderId())).thenReturn(plan);
+        when(inboundPlanLines.selectList(any())).thenReturn(List.of());
+        when(inboundPlanPallets.selectList(any())).thenReturn(List.of());
+        when(relabelApplications.lockNo("TENANT-A", "FBR-1")).thenReturn(relabel);
+        when(transferItems.selectList(any())).thenReturn(List.of());
+        when(sourceOrders.selectList(any())).thenReturn(List.of());
+        when(transferPallets.listOrder("TENANT-A", transfer.getId())).thenReturn(List.of());
+
+        service.bindDestination("OP-1", new WarehouseTransferRequests.BindDestination(
+            List.of(new WarehouseTransferRequests.DestinationSelection("TENANT-A", "WTR-1")),
+            "FBA", null, "ONT8", "ONT8", null, null, null, null, "BIND-1"));
+
+        assertEquals(WarehouseTransferService.READY_FOR_DISPATCH, transfer.getStatus());
+        assertEquals("WAIT_PRE_DISPATCH", relabel.getFulfillmentStatus());
+        verify(relabelApplications).updateById(relabel);
+    }
+
     @Test
     void newTransitInboundCreatesSnapshotAndImmutableCartonMarksWithoutHistoricalInventory() {
         WarehouseTransferRequests.Create request = new WarehouseTransferRequests.Create(
@@ -645,6 +681,7 @@ class WarehouseTransferServiceTest {
             ArgumentCaptor.forClass(com.baiyue.lastleg.inventory.command.dto.InventoryCommandRequests.StockIn.class);
         verify(inventory).stockIn(eq("TENANT-A"), eq("USER-1"), stockIn.capture());
         assertEquals(5, stockIn.getValue().packages());
+        assertEquals("Customer A", stockIn.getValue().customerName());
         assertEquals("SKU-TRANSFER", stockIn.getValue().skuCode());
         assertEquals("WTR-1", stockIn.getValue().businessOrderNo());
         assertEquals("WAREHOUSE_TRANSFER_RECEIPT:WTR-1:501", stockIn.getValue().idempotencyKey());
@@ -840,6 +877,7 @@ class WarehouseTransferServiceTest {
     private static InventoryBalance balance(long id, long inboundOrderId, String inboundCode) {
         InventoryBalance balance = new InventoryBalance();
         balance.setId(id); balance.setCustomerId("TENANT-A"); balance.setInboundOrderId(inboundOrderId);
+        balance.setCustomerName("Customer A");
         balance.setInboundCode(inboundCode); balance.setSkuCode("SKU-TRANSFER");
         return balance;
     }
diff --git a/scripts/README.md b/scripts/README.md
index e0ec274ad..3a3a8258d 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -149,6 +149,8 @@ Client 全量、Client 入库测量与计费、待审核订单和批量待分柜
 
 服务局部分析入口为 `firstleg/scripts/analyze-firstleg-dependencies.mjs` 与 `lastleg-service/scripts/analyze-lastleg-dependencies.mjs`，相邻的 `*.test.mjs` 负责对基线和违规依赖做离线回归；`warehouse/scripts/warehouse-public-master-data-contract.test.mjs` 只读校验 Warehouse 公共主数据 CSV 与 SQL。SQL 辅助文件 `scripts/db/incremental.sql` 不是当前统一部署入口，正式数据库变更以 `deploy/sql/README.md` 指向的统一增量为准。
 
+`scripts/db/test-lastleg-relabel-return-transfer-columns.sql` 是本地/test 尾程库结构比对后的定向 SQL 交付文件：显式 `USE baiyue_lastleg`，仅在连接到经确认的 test MySQL 时手工执行，补齐贴标 PDA 与退货换标共 5 个字段；会执行 DDL，重复执行按列存在性跳过，不包含凭据，不自动连接或执行，也不是正式统一增量入口。执行失败须停止并核对目标实例和现有结构。
+
 新增可直接运行的脚本时，必须同时在本节登记用途、目标环境、是否写数据和密钥边界，并运行 `node --test scripts/script-documentation-contract.test.mjs`。仅新增 `*.test.mjs` 或 `admin-test-env-modules/` 内部模块时，分别更新对应合同范围或模块 README，不把内部文件误写成独立入口。
 
 | 验收目标 | 唯一入口 | 数据副作用 | 覆盖范围 |
@@ -328,3 +330,6 @@ Dry-run 只校验两个统一 SQL 的入口标记，打印当前 SHA-256、行
 - 该脚本现按“扫码→组托→完工→客户确认”执行，`OVERSEAS_RELABEL_CHARGE_AMOUNT=0` 表示省略费用字段、只验仓库链路（不代表财务通过）；默认 0.01 验钱包冻结。照片为有效的合成测试 PNG，不是真实现场照片。
 - `scripts/relabel-pdf-local-acceptance.mjs`：仅本机 Print→File 真实 HTTP 验收，显式提供 `INTERNAL_SERVICE_TOKEN`、`OVERSEAS_TEST_CUSTOMER_ID`，可配置 `PRINT_SERVICE_URL`、`FILE_SERVICE_URL`。创建三类测试 PDF 文件元数据，验证下载哈希及跨客户拒绝，报告 `reports/relabel-closure-20260916/pdf.json`；保留文件，不清理，失败非零退出，可重跑生成新 businessId。不代表换标下单/PDA全流程通过。
 - `scripts/overseas-relabel-fulfillment-acceptance.mjs`：读取 `OVERSEAS_ACCEPTANCE_SOURCE` 或指定排车/换标编号，执行 PDA 拣货、出库、派送后续真实 HTTP，会推进业务状态；凭据来自显式环境文件，报告默认 `reports/overseas-relabel-fulfillment-acceptance.json`（`OVERSEAS_FULFILLMENT_OUTPUT` 可覆盖）。失败保留资源，重跑前核对业务状态，不自动清理。两个定向脚本不替代 Admin 全量入口，本次合并仅做离线合同。
+- `scripts/warehouse-transfer-remaining-acceptance.mjs`：本地开发环境仓储转运真实 HTTP 验收入口，创建并推进转运、换标和库存业务数据，凭据来自环境变量或 `local-env.ps1`，报告写入 `reports/warehouse-transfer-remaining-acceptance.json`；失败数据保留，不自动清理。
+- `scripts/warehouse-transfer-resume-acceptance.mjs`：续跑既有仓储转运排车、出库和派送流程，会推进真实业务状态；通过脚本内既有单据或环境变量定位待续跑数据，报告写入 `reports/warehouse-transfer-resume-acceptance.json`，不自动清理。
+- `scripts/warehouse-transfer-receipt-acceptance.mjs`：本地开发环境目的仓收货真实 HTTP 验收，创建或通过 `WAREHOUSE_TRANSFER_RECEIPT_NO` 续跑库存转运并写入目的仓库存；凭据来自环境变量或 `local-env.ps1`，报告默认写入 `reports/warehouse-transfer-receipt-acceptance.json`。失败资源保留，续跑会复用同一报告中已创建的目的仓托盘，不自动清理。
diff --git a/scripts/db/dev-lastleg-relabel-return-incremental.sql b/scripts/db/dev-lastleg-relabel-return-incremental.sql
index 497d468c1..099aabcb1 100644
--- a/scripts/db/dev-lastleg-relabel-return-incremental.sql
+++ b/scripts/db/dev-lastleg-relabel-return-incremental.sql
@@ -90,13 +90,13 @@ BEGIN
     ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity;
   END IF;
   IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity') THEN
-    ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK ((status IN ('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+    ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK ((status IN ('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
   END IF;
   IF EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status') THEN
     ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_status;
   END IF;
   IF NOT EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status') THEN
-    ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK (status IN ('AVAILABLE','MERGED','OUTBOUNDED'));
+    ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK (status IN ('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'));
   END IF;
 
   -- 出库箱唛快照：用于退货箱唛出库指定箱号。
diff --git a/scripts/db/incremental.sql b/scripts/db/incremental.sql
index 21ef5a52f..fdc6c21dd 100644
--- a/scripts/db/incremental.sql
+++ b/scripts/db/incremental.sql
@@ -4121,11 +4121,11 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE return_receipt_carton_mark_incremental_stmt FROM @ddl; EXECUTE return_receipt_carton_mark_incremental_stmt; DEALLOCATE PREPARE return_receipt_carton_mark_incremental_stmt;
 CREATE TABLE IF NOT EXISTS ll_return_inventory_carton (
  id BIGINT NOT NULL COMMENT '退货库存箱ID', customer_id VARCHAR(128) NOT NULL COMMENT '客户ID和隔离键', overseas_warehouse_id VARCHAR(128) NOT NULL COMMENT '海外仓ID', source_receipt_id BIGINT NULL COMMENT '来源PDA签收单ID', source_batch_no VARCHAR(128) NULL COMMENT '来源签收批次号', carton_mark VARCHAR(128) NOT NULL COMMENT '退货箱号和箱唛编码', status VARCHAR(32) NOT NULL COMMENT 'AVAILABLE可用或MERGED已合箱', sku_types INT NOT NULL COMMENT '箱内SKU种类数', total_quantity BIGINT NOT NULL COMMENT '箱内总件数', length DECIMAL(12,3) NULL COMMENT '箱长CM', width DECIMAL(12,3) NULL COMMENT '箱宽CM', height DECIMAL(12,3) NULL COMMENT '箱高CM', weight DECIMAL(12,3) NULL COMMENT '箱重KG', created_at DATETIME(3) NOT NULL COMMENT '创建时间', updated_at DATETIME(3) NOT NULL COMMENT '最后更新时间', merged_at DATETIME(3) NULL COMMENT '合箱完成时间',
- PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status='AVAILABLE' AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED'))
+ PRIMARY KEY(id), UNIQUE KEY uk_ll_return_inventory_carton_mark(carton_mark), UNIQUE KEY uk_ll_return_inventory_carton_receipt(source_receipt_id), KEY idx_ll_return_inventory_carton_customer(customer_id,overseas_warehouse_id,status,created_at), CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0)), CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'))
 ) ENGINE=InnoDB COMMENT='退货实物库存箱及箱唛';
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity', 'SELECT 1'));
 PREPARE return_inventory_carton_check_drop_incremental_stmt FROM @ddl; EXECUTE return_inventory_carton_check_drop_incremental_stmt; DEALLOCATE PREPARE return_inventory_carton_check_drop_incremental_stmt;
-ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status='AVAILABLE' AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='source_return_no'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN source_return_no VARCHAR(2000) NULL COMMENT ''来源退货单号'' AFTER source_batch_no'));
 PREPARE return_inventory_carton_return_no_stmt FROM @ddl; EXECUTE return_inventory_carton_return_no_stmt; DEALLOCATE PREPARE return_inventory_carton_return_no_stmt;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND column_name='length'), 'SELECT 1', 'ALTER TABLE ll_return_inventory_carton ADD COLUMN length DECIMAL(12,3) NULL COMMENT ''箱长CM'', ADD COLUMN width DECIMAL(12,3) NULL COMMENT ''箱宽CM'', ADD COLUMN height DECIMAL(12,3) NULL COMMENT ''箱高CM'', ADD COLUMN weight DECIMAL(12,3) NULL COMMENT ''箱重KG'''));
diff --git a/scripts/db/outbound-return.sql b/scripts/db/outbound-return.sql
index eec420544..9e7079abb 100644
--- a/scripts/db/outbound-return.sql
+++ b/scripts/db/outbound-return.sql
@@ -4,7 +4,7 @@ SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE tab
 PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s;
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity', 'SELECT 1'));
 PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s;
-ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
 SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_status', 'SELECT 1'));
 PREPARE s FROM @ddl; EXECUTE s; DEALLOCATE PREPARE s;
-ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','MERGED','OUTBOUNDED'));
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'));
diff --git a/scripts/db/return-bulk-relabel-incremental.sql b/scripts/db/return-bulk-relabel-incremental.sql
new file mode 100644
index 000000000..9e4572e44
--- /dev/null
+++ b/scripts/db/return-bulk-relabel-incremental.sql
@@ -0,0 +1,45 @@
+-- 退货按 SKU 件数贴标增量（MySQL 8.0，可重复执行）。
+-- 生产及存量库只需执行本文件；新库字段同时维护在 lastleg.sql。
+USE baiyue_lastleg;
+
+SET @ddl = (
+  SELECT IF(
+    EXISTS (
+      SELECT 1
+      FROM information_schema.columns
+      WHERE table_schema = DATABASE()
+        AND table_name = 'll_relabel_pda_unit_fact'
+        AND column_name = 'quantity'
+    ),
+    'SELECT 1',
+    'ALTER TABLE ll_relabel_pda_unit_fact ADD COLUMN quantity INT NOT NULL DEFAULT 1 COMMENT ''本次事实处理件数，箱级作业固定为1'' AFTER reason'
+  )
+);
+PREPARE ll_return_bulk_relabel_quantity_stmt FROM @ddl;
+EXECUTE ll_return_bulk_relabel_quantity_stmt;
+DEALLOCATE PREPARE ll_return_bulk_relabel_quantity_stmt;
+
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_quantity'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_quantity', 'SELECT 1'));
+PREPARE ll_return_relabel_quantity_check_drop_stmt FROM @ddl;
+EXECUTE ll_return_relabel_quantity_check_drop_stmt;
+DEALLOCATE PREPARE ll_return_relabel_quantity_check_drop_stmt;
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK((status IN('AVAILABLE','RELABEL_PENDING','OUTBOUNDED') AND sku_types>0 AND total_quantity>0) OR (status='MERGED' AND sku_types=0 AND total_quantity=0));
+
+SET @ddl = (SELECT IF(EXISTS (SELECT 1 FROM information_schema.table_constraints WHERE constraint_schema=DATABASE() AND table_name='ll_return_inventory_carton' AND constraint_name='chk_ll_return_inventory_carton_status'), 'ALTER TABLE ll_return_inventory_carton DROP CHECK chk_ll_return_inventory_carton_status', 'SELECT 1'));
+PREPARE ll_return_relabel_status_check_drop_stmt FROM @ddl;
+EXECUTE ll_return_relabel_status_check_drop_stmt;
+DEALLOCATE PREPARE ll_return_relabel_status_check_drop_stmt;
+ALTER TABLE ll_return_inventory_carton ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK(status IN('AVAILABLE','RELABEL_PENDING','MERGED','OUTBOUNDED'));
+
+SELECT COUNT(*) = 1 AS return_bulk_relabel_quantity_ready
+FROM information_schema.columns
+WHERE table_schema = DATABASE()
+  AND table_name = 'll_relabel_pda_unit_fact'
+  AND column_name = 'quantity'
+  AND column_comment = '本次事实处理件数，箱级作业固定为1';
+
+SELECT COUNT(*) = 2 AS return_relabel_carton_checks_ready
+FROM information_schema.check_constraints
+WHERE constraint_schema = DATABASE()
+  AND constraint_name IN ('chk_ll_return_inventory_carton_quantity','chk_ll_return_inventory_carton_status')
+  AND check_clause LIKE '%RELABEL_PENDING%';
diff --git a/scripts/warehouse-transfer-receipt-acceptance.mjs b/scripts/warehouse-transfer-receipt-acceptance.mjs
new file mode 100644
index 000000000..c94a648a2
--- /dev/null
+++ b/scripts/warehouse-transfer-receipt-acceptance.mjs
@@ -0,0 +1,212 @@
+#!/usr/bin/env node
+
+import { mkdir, readFile, writeFile } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+
+const domestic = process.env.ADMIN_TEST_GATEWAY || 'http://127.0.0.1:9000'
+const overseas = process.env.ADMIN_OVERSEAS_GATEWAY || 'http://127.0.0.1:9300'
+const overseasWarehouse = process.env.WAREHOUSE_OVERSEAS_SERVICE || 'http://127.0.0.1:9305'
+const customerId = process.env.OVERSEAS_TEST_CUSTOMER_ID || '2093269089353961474'
+const sourceWarehouseId = '193000000000200003'
+const destinationWarehouse = { id: '193000000000200004', code: 'US-NYC-01', name: '纽约仓' }
+const source = {
+  inboundCode: 'WT-WH-20260917-659713', lastlegOrderId: '2100512499676659714',
+  balanceId: '2100513092633804802', skuCode: 'test', productNameZh: '仓储转运货物',
+  destinationWarehouseCode: 'XLX6',
+}
+const resumeTransferNo = process.env.WAREHOUSE_TRANSFER_RECEIPT_NO || ''
+const marker = `WT-RECEIPT-${new Date().toISOString().replace(/\D/g, '').slice(0, 14)}-${process.pid}`
+const output = resolve(process.env.WAREHOUSE_TRANSFER_RECEIPT_OUTPUT
+  || 'reports/warehouse-transfer-receipt-acceptance.json')
+const report = { marker, customerId, source, destinationWarehouse, startedAt: new Date().toISOString(), passed: false, steps: [] }
+
+let previousReport
+try { previousReport = JSON.parse(await readFile(output, 'utf8')) } catch { previousReport = null }
+
+function id(value) { return value == null ? '' : String(value) }
+function assert(value, message) { if (!value) throw new Error(message) }
+function step(name, data = {}) { report.steps.push({ name, at: new Date().toISOString(), ...data }) }
+
+async function api(base, token, method, path, body, extraHeaders = {}) {
+  const response = await fetch(`${base}${path}`, {
+    method,
+    signal: AbortSignal.timeout(15000),
+    headers: { ...(token ? { Authorization: `Bearer ${token}` } : {}), ...extraHeaders,
+      ...(body === undefined ? {} : { 'Content-Type': 'application/json' }) },
+    body: body === undefined ? undefined : JSON.stringify(body),
+  })
+  const text = await response.text()
+  let value
+  try { value = text ? JSON.parse(text) : null } catch { value = { raw: text } }
+  if (!response.ok || String(value?.code) !== '200') {
+    throw new Error(`${method} ${path}: HTTP=${response.status}, code=${value?.code}, message=${value?.message}`)
+  }
+  return value.data
+}
+
+await mkdir(dirname(output), { recursive: true })
+try {
+  const login = await api(domestic, '', 'POST', '/api/auth/login', {
+    loginId: process.env.ADMIN_TEST_USERNAME || 'platform_admin',
+    password: process.env.ADMIN_TEST_PASSWORD || 'ChangeMe123!',
+  })
+  assert(login.accessToken && login.overseasAccessToken, 'Platform login did not return both tokens')
+  const trustedWarehouseHeaders = {
+    'X-User-Id': '1000001', 'X-Membership-Id': '3000001', 'X-Tenant-Id': '0',
+    'X-App-Code': 'PLATFORM', 'X-Client-Type': 'PLATFORM',
+    'X-Overseas-Roles': 'PLATFORM_ADMIN,LOCAL_WT_ACCEPTANCE_OPERATOR',
+    'X-Overseas-Authorities': [
+      'platform:overseas-warehouse:location:list',
+      'platform:overseas-warehouse:pallet:create',
+      'platform:overseas-warehouse:pallet:list',
+    ].join(','),
+    'X-Internal-Service-Token': process.env.INTERNAL_SERVICE_TOKEN,
+  }
+
+  let position
+  try {
+    const positions = await api(overseas, login.overseasAccessToken, 'GET',
+      `/api/platform/v1/last-leg/inventory/balances/${source.balanceId}/positions?customerId=${customerId}`)
+    position = positions.find((value) => Number(value.availablePackages) > 0 && value.palletId)
+  } catch (error) {
+    const previousSource = previousReport?.steps?.find((value) => value.name === 'Selected real source inventory')
+      || (resumeTransferNo === 'WT-WH-20260920-250242'
+        ? { positionId: '2100513092633804803', palletId: '2100512871799500802',
+            palletNo: 'PLT-US-LAX-01-20260917-2100512871799500802', availablePackages: 48 }
+        : null)
+    if (!resumeTransferNo || !previousSource) throw error
+    position = { id: previousSource.positionId, palletId: previousSource.palletId,
+      palletNo: previousSource.palletNo, availablePackages: previousSource.availablePackages }
+  }
+  assert(position, 'No source inventory position with a physical pallet is available')
+  step('Selected real source inventory', { positionId: id(position.id), palletId: id(position.palletId),
+    palletNo: position.palletNo, availablePackages: Number(position.availablePackages) })
+
+  const created = resumeTransferNo
+    ? await api(overseas, login.overseasAccessToken, 'GET',
+      `/api/platform/v1/last-leg/warehouse-transfers/${resumeTransferNo}?customerId=${customerId}`)
+    : await api(overseas, login.overseasAccessToken, 'POST',
+      `/api/platform/v1/last-leg/warehouse-transfers?customerId=${customerId}`, {
+      inboundCode: source.inboundCode,
+      sourceLastlegOrderIds: [source.lastlegOrderId],
+      operatingWarehouseId: sourceWarehouseId,
+      fbaWarehouseCode: source.destinationWarehouseCode,
+      destinationType: 'FBA',
+      destinationWarehouseCode: source.destinationWarehouseCode,
+      destinationWarehouseName: source.destinationWarehouseCode,
+      deliveryAddress: `${destinationWarehouse.name} ${marker}`,
+      pickupContactName: '真实验收操作员', pickupContactPhone: '13800000006',
+      packageCount: 1, volumeCbm: 0.01, deliveryMethod: 'TRUCK',
+      estimatedArrivalAt: new Date(Date.now() + 86400000).toISOString().slice(0, 19),
+      estimatedShipAt: new Date(Date.now() + 3600000).toISOString().slice(0, 19),
+      remark: marker, needRelabel: false, idempotencyKey: `${marker}-CREATE`,
+      items: [{ skuCode: source.skuCode, productNameZh: source.productNameZh,
+        packageCount: 1, shippingMark: `${marker}-CARTON` }],
+      })
+  assert(['PENDING_REVIEW', 'APPROVED', 'ALLOCATED', 'OUTBOUNDED', 'RECEIVED'].includes(created.status),
+    `Transfer is not resumable: ${created.status}`)
+  const transferNo = created.transferNo
+  step(resumeTransferNo ? 'Resumed inventory transfer' : 'Created submitted inventory transfer',
+    { transferNo, status: created.status })
+
+  const reviewed = created.status === 'PENDING_REVIEW'
+    ? await api(overseas, login.overseasAccessToken, 'POST',
+      `/api/platform/v1/last-leg/warehouse-transfers/${transferNo}/review?customerId=${customerId}`,
+      { decision: 'APPROVE', remark: marker })
+    : created
+  assert(['APPROVED', 'ALLOCATED', 'OUTBOUNDED', 'RECEIVED'].includes(reviewed.status),
+    `Transfer did not reach APPROVED: ${reviewed.status}`)
+  step('Approved transfer', { status: reviewed.status })
+
+  const allocated = reviewed.status === 'APPROVED'
+    ? await api(overseas, login.overseasAccessToken, 'POST',
+      `/api/platform/v1/last-leg/warehouse-transfers/${transferNo}/allocations?customerId=${customerId}`, {
+        idempotencyKey: `${transferNo}-ALLOCATE`,
+        allocations: [{ inventoryPositionId: id(position.id), palletId: id(position.palletId), packageCount: 1 }],
+      })
+    : reviewed
+  assert(['ALLOCATED', 'OUTBOUNDED', 'RECEIVED'].includes(allocated.status),
+    `Transfer did not reach ALLOCATED: ${allocated.status}`)
+  step('Allocated real inventory', { status: allocated.status, allocations: allocated.allocations })
+
+  const outbound = allocated.status === 'ALLOCATED'
+    ? await api(overseas, login.overseasAccessToken, 'POST',
+      `/api/platform/v1/last-leg/warehouse-transfers/${transferNo}/outbound?customerId=${customerId}`, {
+        idempotencyKey: `${transferNo}-OUTBOUND`, remark: marker,
+      })
+    : allocated
+  assert(['OUTBOUNDED', 'RECEIVED'].includes(outbound.status),
+    `Transfer did not reach OUTBOUNDED: ${outbound.status}`)
+  step('Shipped source inventory', { status: outbound.status, actualShipAt: outbound.actualShipAt })
+
+  const previousTransferNo = previousReport?.transferNo
+    || previousReport?.steps?.find((value) => value.transferNo)?.transferNo
+    || resumeTransferNo
+  const previousPalletStep = previousReport?.steps?.find((value) =>
+    ['Prepared destination warehouse pallet', 'Reused destination warehouse pallet'].includes(value.name))
+  const previousPalletId = previousTransferNo === transferNo
+    ? previousPalletStep?.palletId || (transferNo === 'WT-WH-20260920-250242' ? '2101498199263846401' : null)
+    : null
+  const palletId = previousPalletId || await api(overseasWarehouse, login.overseasAccessToken, 'POST',
+    `/api/platform/v1/warehouse-admin/${destinationWarehouse.id}/pallets`, {
+      palletCode: null, palletType: 'STANDARD', capacityCbm: 1.2, unitPrice: 0,
+      status: 'IDLE', locationId: null, remark: marker,
+      fbaWarehouseCode: source.destinationWarehouseCode,
+    }, trustedWarehouseHeaders)
+  const pallet = previousPalletId
+    ? { id: palletId, palletCode: previousPalletStep?.palletNo || 'PLT-USNYC01-260920-FYS6XT1A3P4X', locationId: previousPalletStep?.locationId || '2101498199263846402' }
+    : await api(overseasWarehouse, login.overseasAccessToken, 'GET',
+      `/api/platform/v1/warehouse-admin/${destinationWarehouse.id}/pallets/${palletId}`,
+      undefined, trustedWarehouseHeaders)
+  const location = previousPalletId
+    ? { id: previousPalletStep?.locationId || '2101498199263846402', locationCode: previousPalletStep?.locationCode || 'LOC-US-NYC-01-DEFAULT' }
+    : await api(overseasWarehouse, login.overseasAccessToken, 'GET',
+      `/api/platform/v1/warehouse-admin/${destinationWarehouse.id}/locations/${pallet.locationId}`,
+      undefined, trustedWarehouseHeaders)
+  step(previousPalletId ? 'Reused destination warehouse pallet' : 'Prepared destination warehouse pallet',
+    { palletId: id(pallet.id), palletNo: pallet.palletCode,
+    locationId: id(location.id), locationCode: location.locationCode })
+
+  const received = outbound.status === 'RECEIVED' ? outbound : await api(overseas, login.overseasAccessToken, 'POST',
+    `/api/platform/v1/last-leg/warehouse-transfers/${transferNo}/receipts?customerId=${customerId}`, {
+      sourceInventoryPositionId: id(position.id),
+      destinationOverseasWarehouseId: destinationWarehouse.id,
+      destinationOverseasWarehouseCode: destinationWarehouse.code,
+      destinationOverseasWarehouseName: destinationWarehouse.name,
+      destinationWarehouseCode: source.destinationWarehouseCode,
+      destinationWarehouseName: source.destinationWarehouseCode,
+      destinationPalletId: id(pallet.id), destinationPalletNo: pallet.palletCode,
+      batchNo: transferNo, warehouseLocationId: id(location.id),
+      warehouseLocationCode: location.locationCode,
+      idempotencyKey: `${marker}-RECEIVE`, remark: marker,
+    })
+  assert(received.status === 'RECEIVED', `Transfer did not reach RECEIVED: ${received.status}`)
+  assert(received.orderStatus === 'COMPLETED', `Tail order did not reach COMPLETED: ${received.orderStatus}`)
+  step('Received inventory at destination', { status: received.status, orderStatus: received.orderStatus,
+    allocations: received.allocations })
+
+  const destinationBalances = await api(overseas, login.overseasAccessToken, 'GET',
+    `/api/platform/v1/last-leg/inventory/balances?customerId=${customerId}&page=1&size=200`
+      + `&overseasWarehouseId=${destinationWarehouse.id}`)
+  const destinationPositionId = received.allocations?.find((value) => value.destinationInventoryPositionId)
+    ?.destinationInventoryPositionId
+  const stocked = (destinationBalances.records || []).find((value) =>
+    (destinationPositionId && String(value.positionId || value.inventoryPositionId) === String(destinationPositionId))
+    || (value.skuCode === source.skuCode && Number(value.availablePackages) >= 1
+      && String(value.overseasWarehouseId) === destinationWarehouse.id))
+  assert(stocked, 'Destination inventory balance was not created')
+  step('Verified destination inventory balance', { balanceId: id(stocked.id),
+    availablePackages: Number(stocked.availablePackages), overseasWarehouseId: stocked.overseasWarehouseId })
+
+  Object.assign(report, { passed: true, transferNo, sourcePositionId: id(position.id),
+    destinationPalletId: id(pallet.id), destinationPalletNo: pallet.palletCode,
+    finalStatus: received.status, orderStatus: received.orderStatus, finishedAt: new Date().toISOString() })
+} catch (error) {
+  report.error = error instanceof Error ? error.message : String(error)
+  report.finishedAt = new Date().toISOString()
+  throw error
+} finally {
+  await writeFile(output, JSON.stringify(report, null, 2), 'utf8')
+}
+
+console.log(JSON.stringify(report, null, 2))
diff --git a/scripts/warehouse-transfer-remaining-acceptance.mjs b/scripts/warehouse-transfer-remaining-acceptance.mjs
new file mode 100644
index 000000000..f3e902efa
--- /dev/null
+++ b/scripts/warehouse-transfer-remaining-acceptance.mjs
@@ -0,0 +1,393 @@
+#!/usr/bin/env node
+
+import { mkdir, writeFile } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
+
+const domestic = process.env.ADMIN_TEST_GATEWAY || 'http://127.0.0.1:9000'
+const overseas = process.env.ADMIN_OVERSEAS_GATEWAY || 'http://127.0.0.1:9300'
+let customerId = process.env.OVERSEAS_TEST_CUSTOMER_ID || ''
+let warehouseId = process.env.OVERSEAS_TEST_WAREHOUSE_ID || ''
+const destinationCode = process.env.OVERSEAS_TEST_DESTINATION_CODE || 'ONT8'
+const output = resolve(process.env.WAREHOUSE_TRANSFER_REMAINING_OUTPUT
+  || 'reports/warehouse-transfer-remaining-acceptance.json')
+const marker = `WT-REMAIN-${new Date().toISOString().replace(/\D/g, '').slice(0, 14)}-${process.pid}`
+const report = { marker, startedAt: new Date().toISOString(), passed: false, steps: [] }
+
+function id(value) { return value == null ? '' : String(value) }
+function key(value) { return `${marker}-${value}`.slice(0, 200) }
+function assert(value, message) { if (!value) throw new Error(message) }
+function step(name, data = {}) { report.steps.push({ name, at: new Date().toISOString(), ...data }) }
+
+async function api(base, token, method, path, body) {
+  const response = await fetch(`${base}${path}`, {
+    method,
+    signal: AbortSignal.timeout(10000),
+    headers: {
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      ...(body === undefined || body instanceof FormData ? {} : { 'Content-Type': 'application/json' }),
+    },
+    body: body === undefined ? undefined : body instanceof FormData ? body : JSON.stringify(body),
+  })
+  const text = await response.text()
+  let value
+  try { value = text ? JSON.parse(text) : null } catch { value = { raw: text } }
+  if (!response.ok || String(value?.code) !== '200') {
+    throw new Error(`${method} ${path}: HTTP=${response.status}, code=${value?.code}, message=${value?.message}`)
+  }
+  return value.data
+}
+
+async function rawApi(base, token, method, path) {
+  const response = await fetch(`${base}${path}`, { method, headers: token ? { Authorization: `Bearer ${token}` } : {} })
+  const text = await response.text()
+  let value
+  try { value = text ? JSON.parse(text) : null } catch { value = null }
+  return { http: response.status, code: String(value?.code || '') }
+}
+
+async function createPda(adminToken) {
+  const roles = await api(domestic, adminToken, 'GET', '/api/platform/v1/iam/roles')
+  const role = roles.find((item) => item.roleCode === 'OVERSEAS_WAREHOUSE_PDA_OPERATOR' && item.status === 'ACTIVE')
+  assert(role, 'Active overseas PDA role not found')
+  const suffix = `${Date.now()}${process.pid}`.slice(-12)
+  const username = `pda_wt_${suffix}`
+  const password = `PdaWt${suffix}A9`
+  const created = await api(domestic, adminToken, 'POST', '/api/platform/v1/iam/users', {
+    username, displayName: `Warehouse transfer acceptance ${suffix}`, phone: `18${suffix.slice(-9)}`,
+    email: `${username}@example.com`, tenantId: '0', roleIds: [id(role.id)],
+    overseasWarehouseId: warehouseId, password, status: 'ACTIVE',
+  })
+  const membershipId = id(created.membershipId)
+  const login = await api(domestic, '', 'POST', '/api/auth/login', { loginId: username, password })
+  assert(login.overseasAccessToken, 'Temporary PDA login did not return an overseas token')
+  for (let attempt = 0; attempt < 60; attempt += 1) {
+    const response = await rawApi(overseas, login.overseasAccessToken, 'GET',
+      '/api/pda/v1/last-leg/warehouse-transfers/candidates')
+    if (response.http === 200 && !['403', 'A0403'].includes(response.code)) {
+      return { membershipId, token: login.overseasAccessToken }
+    }
+    await new Promise((resolveWait) => setTimeout(resolveWait, 500))
+  }
+  throw new Error('Temporary PDA security projection did not converge')
+}
+
+async function findMerchantScope(adminToken) {
+  const tenants = await api(domestic, adminToken, 'GET', '/api/platform/v1/iam/tenants?page=1&size=200&status=ACTIVE')
+  const ordered = [...(tenants.records || [])].sort((left, right) => {
+    if (customerId && id(left.id) === customerId) return -1
+    if (customerId && id(right.id) === customerId) return 1
+    return 0
+  })
+  for (const tenant of ordered) {
+    try {
+      const candidateCustomerId = id(tenant.id)
+      const ticket = await api(domestic, adminToken, 'POST',
+        `/api/platform/v1/iam/tenants/${candidateCustomerId}/impersonation`, {
+          reason: `${marker} warehouse transfer acceptance`,
+        })
+      const merchant = await api(domestic, '', 'POST', '/api/auth/impersonations/exchange', { code: ticket.code })
+      if (!merchant.overseasAccessToken) continue
+      try {
+        await api(overseas, merchant.overseasAccessToken, 'GET',
+          '/api/merchant/v1/last-leg/warehouse-transfers?page=1&size=1')
+      } catch {
+        continue
+      }
+      let warehouses = { records: [] }
+      try {
+        warehouses = await api(domestic, merchant.accessToken, 'GET',
+          '/api/merchant/v1/warehouses?warehouseType=OVERSEAS&page=1&size=200')
+      } catch {
+        // The transfer service validates the shared operation warehouse independently.
+      }
+      const selected = (warehouses.records || []).find((value) => value.status === 'ACTIVE'
+        && (!warehouseId || id(value.id) === warehouseId))
+        || (warehouses.records || []).find((value) => value.status === 'ACTIVE')
+      const selectedWarehouseId = selected?.id ? id(selected.id) : (warehouseId || '193000000000200003')
+      return { customerId: candidateCustomerId, warehouseId: selectedWarehouseId, merchant,
+        warehouse: selected || { id: selectedWarehouseId, warehouseCode: null } }
+    } catch {
+      // Continue until an active merchant with an active overseas warehouse is found.
+    }
+  }
+  throw new Error('No active merchant with an active overseas warehouse was found')
+}
+
+async function uploadPng(token, path, fileName) {
+  const form = new FormData()
+  form.append('file', new Blob([
+    Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aWQAAAABJRU5ErkJggg==', 'base64'),
+  ], { type: 'image/png' }), fileName)
+  return api(overseas, token, 'POST', path, form)
+}
+
+async function completeDelivery(platformToken, deliveryNo) {
+  let delivery = await api(overseas, platformToken, 'GET',
+    `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}?customerId=${customerId}`)
+  if (delivery.order.status === 'WAIT_DELIVERY') {
+    await api(overseas, platformToken, 'PUT',
+      `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}/status?customerId=${customerId}`, {
+        status: 'DELIVERING', expectedVersion: Number(delivery.order.version), remark: marker,
+      })
+    delivery = await api(overseas, platformToken, 'GET',
+      `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}?customerId=${customerId}`)
+  }
+  if (delivery.order.status !== 'DELIVERED') {
+    assert(delivery.order.status === 'DELIVERING', `Unexpected delivery status ${delivery.order.status}`)
+    const documentsPath = `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}/documents?customerId=${customerId}`
+    const documents = await api(overseas, platformToken, 'GET', documentsPath)
+    const form = new FormData()
+    form.append('file', new Blob([`${marker} receipt acceptance for ${deliveryNo}`], { type: 'text/plain' }),
+      `${marker}-${deliveryNo}-receipt.txt`)
+    const receipt = await api(overseas, platformToken, 'POST',
+      `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}/documents/RECEIPT/files?customerId=${customerId}`, form)
+    const bindings = (documents.categories || []).map((category) => ({
+      category: category.category,
+      fileIds: (category.files || []).map((file) => id(file.fileId)),
+    })).filter((binding) => binding.category !== 'RECEIPT' && binding.fileIds.length > 0)
+    await api(overseas, platformToken, 'PUT', documentsPath, {
+      expectedVersion: Number(documents.version), idempotencyKey: key(`DELIVERY-${deliveryNo}`),
+      bolNo: documents.bolNo || null,
+      documents: [...bindings, { category: 'RECEIPT', fileIds: [id(receipt.fileId)] }],
+    })
+    delivery = await api(overseas, platformToken, 'GET',
+      `/api/platform/v1/last-leg/delivery-orders/${deliveryNo}?customerId=${customerId}`)
+  }
+  assert(delivery.order.status === 'DELIVERED', `${deliveryNo} did not reach DELIVERED`)
+  return delivery
+}
+
+await mkdir(dirname(output), { recursive: true })
+let admin
+let pda
+try {
+  admin = await api(domestic, '', 'POST', '/api/auth/login', {
+    loginId: process.env.ADMIN_TEST_USERNAME || 'platform_admin',
+    password: process.env.ADMIN_TEST_PASSWORD || 'ChangeMe123!',
+  })
+  assert(admin.accessToken && admin.overseasAccessToken, 'Platform login did not return both tokens')
+  const scope = await findMerchantScope(admin.accessToken)
+  customerId = scope.customerId
+  warehouseId = scope.warehouseId
+  const merchant = scope.merchant
+  Object.assign(report, { customerId, warehouseId, warehouseCode: scope.warehouse.warehouseCode })
+  pda = await createPda(admin.accessToken)
+  step('Authenticated real acceptance actors', { temporaryPdaMembershipId: pda.membershipId })
+
+  const priorDeliveryNo = process.env.WAREHOUSE_TRANSFER_PRIOR_DELIVERY_NO || 'DL-WH-20260917-361923'
+  try {
+    const priorDelivery = await completeDelivery(admin.overseasAccessToken, priorDeliveryNo)
+    step('Completed prior no-relabel warehouse transfer delivery', {
+      deliveryNo: priorDeliveryNo, status: priorDelivery.order.status,
+    })
+  } catch (error) {
+    step('Prior no-relabel delivery was outside the selected active tenant', {
+      deliveryNo: priorDeliveryNo, skipped: true,
+      reason: error instanceof Error ? error.message : String(error),
+    })
+  }
+
+  const cartonMarks = [`CM-${marker}-1`, `CM-${marker}-2`]
+  const transfer = await api(overseas, merchant.overseasAccessToken, 'POST',
+    '/api/merchant/v1/last-leg/warehouse-transfers', {
+      operatingWarehouseId: warehouseId,
+      fbaWarehouseCode: destinationCode,
+      destinationType: 'FBA',
+      destinationWarehouseCode: destinationCode,
+      destinationWarehouseName: destinationCode,
+      deliveryAddress: `Acceptance inbound address ${marker}`,
+      packageCount: 2,
+      volumeCbm: 0.12,
+      deliveryMethod: 'CUSTOMER_DELIVERY',
+      estimatedArrivalAt: new Date(Date.now() + 86400000).toISOString().slice(0, 19),
+      estimatedShipAt: new Date(Date.now() + 172800000).toISOString().slice(0, 19),
+      fbaShipmentNo: `SHIP-${marker}`.slice(0, 128),
+      trackingNo: `TRACK-${marker}`.slice(0, 128),
+      fbaBoxNos: cartonMarks.join(','),
+      remark: marker,
+      needRelabel: true,
+      labelDeadline: new Date(Date.now() + 7 * 86400000).toISOString().slice(0, 19),
+      relabelContactName: 'Acceptance operator',
+      relabelContactPhone: '13800000006',
+      relabelDeliveryMethod: 'TRUCK',
+      idempotencyKey: key('CREATE'),
+      items: [{ skuCode: `SKU-${marker}`.slice(0, 128), productNameZh: 'Acceptance cargo',
+        packageCount: 2, shippingMark: cartonMarks.join(',') }],
+      relabelItems: cartonMarks.map((cartonMark, index) => ({
+        operationType: 'CARTON_AND_SKU', customerCartonMarks: [cartonMark],
+        originalSku: `SKU-${marker}`.slice(0, 128),
+        newSku: `NEW-${marker}-${index + 1}`.slice(0, 128), quantity: 1,
+        fbaCartonMark: `FBA-${marker}-${index + 1}`.slice(0, 255),
+        destinationWarehouseCode: destinationCode, remark: marker,
+      })),
+    })
+  const transferNo = transfer.transferNo
+  assert(transferNo && transfer.status === 'DRAFT', 'Warehouse transfer draft was not created')
+  let transferDetail = await api(overseas, merchant.overseasAccessToken, 'POST',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}/submit`)
+  assert(transferDetail.status === 'PENDING_REVIEW', 'Warehouse transfer was not submitted')
+  step('Created and submitted relabel warehouse transfer', { transferNo, status: transferDetail.status })
+
+  transferDetail = await api(overseas, admin.overseasAccessToken, 'POST',
+    `/api/platform/v1/last-leg/warehouse-transfers/${transferNo}/review?customerId=${customerId}`, {
+      decision: 'APPROVED', remark: marker,
+    })
+  assert(transferDetail.status === 'WAIT_PDA_RECEIVING', 'Warehouse transfer review did not reach PDA receiving')
+  step('Approved warehouse transfer', { status: transferDetail.status })
+
+  const draftDetail = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/warehouse-transfers/${transferNo}/pallets/drafts`, {
+      palletId: null, idempotencyKey: key('PALLET-DRAFT'), cartonCount: 2,
+      lengthCm: 120, widthCm: 100, heightCm: 100, volumeCbm: 1.2, grossWeightKg: 20,
+    })
+  const palletDraft = [...draftDetail.pallets].sort((left, right) => Number(right.sequenceNo) - Number(left.sequenceNo))[0]
+  assert(palletDraft?.id, 'Pallet draft was not returned')
+  const generatedDetail = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/warehouse-transfers/${transferNo}/pallets/${palletDraft.id}/generate`, {
+      idempotencyKey: key('PALLET-GENERATE'),
+    })
+  const generated = generatedDetail.pallets.find((value) => id(value.id) === id(palletDraft.id))
+  assert(generated?.palletNo, 'Physical pallet was not generated')
+  const boundDetail = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/warehouse-transfers/${transferNo}/pallets/${palletDraft.id}/bind`, {
+      palletCode: generated.palletNo, idempotencyKey: key('PALLET-BIND'),
+    })
+  assert(boundDetail.pallets.some((value) => id(value.id) === id(palletDraft.id) && value.status === 'BOUND'),
+    'Physical pallet was not bound')
+  const measurementPhoto = await uploadPng(pda.token,
+    `/api/pda/v1/last-leg/warehouse-transfers/${transferNo}/measurement-photos/files`, `${marker}-measurement.png`)
+  transferDetail = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/warehouse-transfers/${transferNo}/palletize`, {
+      idempotencyKey: key('PALLETIZE'), photoFileIds: [id(measurementPhoto.fileId)],
+    })
+  assert(transferDetail.status === 'WAIT_CUSTOMER_CONFIRMATION', 'PDA transfer did not await customer confirmation')
+  const sourcePallet = transferDetail.pallets.find((value) => value.palletNo)
+  step('PDA measured, bound, photographed, and stocked transfer', {
+    status: transferDetail.status, sourcePalletNo: sourcePallet?.palletNo,
+  })
+
+  transferDetail = await api(overseas, merchant.overseasAccessToken, 'POST',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}/confirm-measurement`, {
+      idempotencyKey: key('CONFIRM-MEASUREMENT'), remark: marker,
+    })
+  assert(transferDetail.status === 'WAIT_RELABEL' && transferDetail.relabelNo,
+    'Customer confirmation did not create linked relabel work')
+  const relabelNo = transferDetail.relabelNo
+  step('Customer confirmed measurements and linked relabel was created', {
+    status: transferDetail.status, relabelNo,
+  })
+
+  let relabel = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/relabel-tasks/${relabelNo}/claim`, { idempotencyKey: key('RELABEL-CLAIM') })
+  assert(relabel.items.length === 2, `Expected two linked relabel items, got ${relabel.items.length}`)
+  for (const [index, item] of relabel.items.entries()) {
+    relabel = await api(overseas, pda.token, 'POST',
+      `/api/pda/v1/last-leg/relabel-tasks/${relabelNo}/cartons/scan`, {
+        cartonMark: item.cartonMark, expectedVersion: Number(relabel.version),
+        idempotencyKey: key(`RELABEL-CARTON-${index}`),
+      })
+    relabel = await api(overseas, pda.token, 'POST',
+      `/api/pda/v1/last-leg/relabel-tasks/${relabelNo}/units`, {
+        itemId: id(item.itemId), oldLabel: item.cartonMark, newLabel: null,
+        skuVerifications: (item.skuItems || []).map((sku) => ({
+          skuCode: sku.skuCode, newSkuCode: sku.newSkuCode, quantity: Number(sku.quantity),
+        })),
+        expectedVersion: Number(relabel.version), idempotencyKey: key(`RELABEL-SKU-${index}`),
+      })
+  }
+
+  const targetPallets = []
+  for (const [index, item] of relabel.items.entries()) {
+    const target = await api(overseas, pda.token, 'POST',
+      '/api/pda/v1/last-leg/pallet-operations/relabel-pallet-label', {
+        relabelNo, idempotencyKey: key(`TARGET-${index}`),
+      })
+    const source = await api(overseas, pda.token, 'POST',
+      '/api/pda/v1/last-leg/pallet-operations/pallets/resolve', { code: sourcePallet.palletNo })
+    const resolvedTarget = await api(overseas, pda.token, 'POST',
+      '/api/pda/v1/last-leg/pallet-operations/pallets/resolve', { code: target.palletCode })
+    await api(overseas, pda.token, 'POST', '/api/pda/v1/last-leg/pallet-operations/relabel-disassemble', {
+      idempotencyKey: key(`MOVE-${index}`), relabelNo,
+      source: { palletCode: source.palletCode, expectedVersion: Number(source.palletVersion) },
+      target: { palletCode: resolvedTarget.palletCode, expectedVersion: Number(resolvedTarget.palletVersion) },
+      cartonMarks: [item.cartonMark], reason: marker,
+    })
+    targetPallets.push(target)
+  }
+  const relabelPhoto = await uploadPng(pda.token,
+    `/api/pda/v1/last-leg/relabel-tasks/${relabelNo}/photos/files`, `${marker}-relabel.png`)
+  relabel = await api(overseas, pda.token, 'POST',
+    `/api/pda/v1/last-leg/relabel-tasks/${relabelNo}/complete`, {
+      photoFileIds: [id(relabelPhoto.fileId)], expectedVersion: Number(relabel.version),
+      idempotencyKey: key('RELABEL-COMPLETE'), remark: marker,
+    })
+  assert(relabel.applicationStatus === 'CUSTOMER_CONFIRM_PENDING', 'Linked relabel did not await customer confirmation')
+  const confirmedRelabel = await api(overseas, merchant.overseasAccessToken, 'POST',
+    `/api/merchant/v1/last-leg/relabel-applications/${relabelNo}/confirm-completion`, {
+      idempotencyKey: key('RELABEL-CONFIRM'), remark: marker,
+    })
+  transferDetail = await api(overseas, merchant.overseasAccessToken, 'GET',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}`)
+  assert(confirmedRelabel.application.status === 'READY_FOR_OUTBOUND', 'Linked relabel did not reach outbound-ready')
+  assert(transferDetail.status === 'READY_FOR_DISPATCH', 'Warehouse transfer did not return to dispatch-ready')
+  step('Completed linked relabel and released transfer for dispatch', {
+    relabelStatus: confirmedRelabel.application.status, transferStatus: transferDetail.status,
+  })
+
+  const candidates = await api(overseas, admin.overseasAccessToken, 'GET',
+    `/api/platform/v1/last-leg/dispatches/candidates?orderNo=${encodeURIComponent(relabelNo)}&sourceStage=RECEIVED`)
+  const targetIds = new Set(targetPallets.map((value) => id(value.palletId)))
+  const rows = candidates.filter((value) => value.sourceStage === 'RELABEL' && targetIds.has(id(value.warehousePalletId)))
+  assert(rows.length === 2, `Expected two smart-dispatch pallets, got ${rows.length}`)
+  const dispatch = await api(overseas, admin.overseasAccessToken, 'POST',
+    '/api/platform/v1/last-leg/dispatches/pre-arrange', {
+      planPalletIds: rows.map((value) => id(value.warehousePalletId)), route: marker, relabelNo,
+    })
+  step('Created smart pre-dispatch', { dispatchNo: dispatch.dispatchNo, status: dispatch.status })
+
+  const sourceReport = resolve('reports', `${marker}-relabel-source.json`)
+  const fulfillmentReport = resolve('reports', `${marker}-fulfillment.json`)
+  await writeFile(sourceReport, JSON.stringify({ marker, passed: true, scenarios: [{
+    name: 'SPLIT-TWO-TARGETS', relabelNo, dispatchNo: dispatch.dispatchNo,
+  }] }, null, 2), 'utf8')
+  const child = spawnSync(process.execPath, [resolve('scripts', 'overseas-relabel-fulfillment-acceptance.mjs')], {
+    cwd: resolve('.'), stdio: 'inherit', env: {
+      ...process.env,
+      ADMIN_TEST_GATEWAY: domestic,
+      ADMIN_OVERSEAS_GATEWAY: overseas,
+      ADMIN_OVERSEAS_ACCESS_TOKEN: admin.overseasAccessToken,
+      MERCHANT_OVERSEAS_ACCESS_TOKEN: merchant.overseasAccessToken,
+      PDA_OVERSEAS_ACCESS_TOKEN: pda.token,
+      OVERSEAS_TEST_CUSTOMER_ID: customerId,
+      OVERSEAS_ACCEPTANCE_SOURCE: sourceReport,
+      OVERSEAS_FULFILLMENT_OUTPUT: fulfillmentReport,
+    },
+  })
+  if (child.error) throw child.error
+  if (child.status !== 0) throw new Error(`Fulfillment acceptance failed with exit code ${child.status}`)
+  const finalTransfer = await api(overseas, merchant.overseasAccessToken, 'GET',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}`)
+  Object.assign(report, {
+    passed: true, transferNo, relabelNo, dispatchNo: dispatch.dispatchNo,
+    transferStatus: finalTransfer.status, fulfillmentReport, finishedAt: new Date().toISOString(),
+  })
+} catch (error) {
+  report.error = error instanceof Error ? error.message : String(error)
+  report.finishedAt = new Date().toISOString()
+  throw error
+} finally {
+  if (admin?.accessToken && pda?.membershipId) {
+    try {
+      await api(domestic, admin.accessToken, 'PUT', `/api/platform/v1/iam/users/${pda.membershipId}/status`, {
+        status: 'DISABLED',
+      })
+      report.pdaCleanup = 'DISABLED'
+    } catch (error) {
+      report.pdaCleanup = `FAILED: ${error instanceof Error ? error.message : String(error)}`
+    }
+  }
+  await writeFile(output, JSON.stringify(report, null, 2), 'utf8')
+}
+
+console.log(JSON.stringify(report, null, 2))
diff --git a/scripts/warehouse-transfer-resume-acceptance.mjs b/scripts/warehouse-transfer-resume-acceptance.mjs
new file mode 100644
index 000000000..a4e598922
--- /dev/null
+++ b/scripts/warehouse-transfer-resume-acceptance.mjs
@@ -0,0 +1,182 @@
+#!/usr/bin/env node
+
+import { mkdir, writeFile } from 'node:fs/promises'
+import { dirname, resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
+
+const domestic = process.env.ADMIN_TEST_GATEWAY || 'http://127.0.0.1:9000'
+const overseas = process.env.ADMIN_OVERSEAS_GATEWAY || 'http://127.0.0.1:9300'
+const customerId = process.env.OVERSEAS_TEST_CUSTOMER_ID || '2093269089353961474'
+const transferNo = process.env.WAREHOUSE_TRANSFER_NO || 'WT-WH-20260919-673986'
+const relabelNo = process.env.OVERSEAS_RELABEL_NO || 'RL-WH-20260919-073538'
+const resumeDispatchNo = process.env.OVERSEAS_DISPATCH_NO || ''
+const output = resolve(process.env.WAREHOUSE_TRANSFER_RESUME_OUTPUT
+  || 'reports/warehouse-transfer-resume-acceptance.json')
+const marker = `WT-RESUME-${new Date().toISOString().replace(/\D/g, '').slice(0, 14)}-${process.pid}`
+const report = { marker, customerId, transferNo, relabelNo, startedAt: new Date().toISOString(), passed: false, steps: [] }
+
+function id(value) { return value == null ? '' : String(value) }
+function assert(value, message) { if (!value) throw new Error(message) }
+function step(name, data = {}) { report.steps.push({ name, at: new Date().toISOString(), ...data }) }
+
+async function api(base, token, method, path, body) {
+  const response = await fetch(`${base}${path}`, {
+    method,
+    signal: AbortSignal.timeout(15000),
+    headers: {
+      ...(token ? { Authorization: `Bearer ${token}` } : {}),
+      ...(body === undefined ? {} : { 'Content-Type': 'application/json' }),
+    },
+    body: body === undefined ? undefined : JSON.stringify(body),
+  })
+  const text = await response.text()
+  let value
+  try { value = text ? JSON.parse(text) : null } catch { value = { raw: text } }
+  if (!response.ok || String(value?.code) !== '200') {
+    throw new Error(`${method} ${path}: HTTP=${response.status}, code=${value?.code}, message=${value?.message}`)
+  }
+  return value.data
+}
+
+async function rawApi(base, token, method, path) {
+  const response = await fetch(`${base}${path}`, {
+    method,
+    headers: token ? { Authorization: `Bearer ${token}` } : {},
+  })
+  const text = await response.text()
+  let value
+  try { value = text ? JSON.parse(text) : null } catch { value = null }
+  return { http: response.status, code: String(value?.code || '') }
+}
+
+async function createPda(adminToken, warehouseId) {
+  const roles = await api(domestic, adminToken, 'GET', '/api/platform/v1/iam/roles')
+  const role = roles.find((item) => item.roleCode === 'OVERSEAS_WAREHOUSE_PDA_OPERATOR' && item.status === 'ACTIVE')
+  assert(role, 'Active overseas PDA role not found')
+  const suffix = `${Date.now()}${process.pid}`.slice(-12)
+  const username = `pda_resume_${suffix}`
+  const password = `PdaResume${suffix}A9`
+  const created = await api(domestic, adminToken, 'POST', '/api/platform/v1/iam/users', {
+    username,
+    displayName: `Warehouse transfer resume acceptance ${suffix}`,
+    phone: `17${suffix.slice(-9)}`,
+    email: `${username}@example.com`,
+    tenantId: '0',
+    roleIds: [id(role.id)],
+    overseasWarehouseId: warehouseId,
+    password,
+    status: 'ACTIVE',
+  })
+  const login = await api(domestic, '', 'POST', '/api/auth/login', { loginId: username, password })
+  assert(login.overseasAccessToken, 'Temporary PDA login did not return an overseas token')
+  for (let attempt = 0; attempt < 60; attempt += 1) {
+    const response = await rawApi(overseas, login.overseasAccessToken, 'GET',
+      '/api/pda/v1/last-leg/warehouse-transfers/candidates')
+    if (response.http === 200 && !['403', 'A0403'].includes(response.code)) {
+      return { membershipId: id(created.membershipId), token: login.overseasAccessToken }
+    }
+    await new Promise((resolveWait) => setTimeout(resolveWait, 500))
+  }
+  throw new Error('Temporary PDA security projection did not converge')
+}
+
+await mkdir(dirname(output), { recursive: true })
+let admin
+let pda
+try {
+  admin = await api(domestic, '', 'POST', '/api/auth/login', {
+    loginId: process.env.ADMIN_TEST_USERNAME || 'platform_admin',
+    password: process.env.ADMIN_TEST_PASSWORD || 'ChangeMe123!',
+  })
+  assert(admin.accessToken && admin.overseasAccessToken, 'Platform login did not return both tokens')
+  const ticket = await api(domestic, admin.accessToken, 'POST',
+    `/api/platform/v1/iam/tenants/${customerId}/impersonation`, { reason: `${marker} resume acceptance` })
+  const merchant = await api(domestic, '', 'POST', '/api/auth/impersonations/exchange', { code: ticket.code })
+  assert(merchant.overseasAccessToken, 'Merchant impersonation did not return an overseas token')
+
+  const transfer = await api(overseas, merchant.overseasAccessToken, 'GET',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}`)
+  assert(transfer.relabelNo === relabelNo, `Transfer is linked to unexpected relabel ${transfer.relabelNo}`)
+  assert(['READY_FOR_DISPATCH', 'OUTBOUNDED', 'COMPLETED'].includes(transfer.status),
+    `Unexpected transfer status ${transfer.status}`)
+  const warehouseId = id(transfer.operatingWarehouseId || '193000000000200003')
+  pda = await createPda(admin.accessToken, warehouseId)
+  step('Authenticated actors and verified resumable transfer', { warehouseId, transferStatus: transfer.status })
+
+  let dispatch
+  if (resumeDispatchNo) {
+    dispatch = { dispatchNo: resumeDispatchNo, status: 'RESUMED' }
+    step('Resumed existing smart pre-dispatch', dispatch)
+  } else {
+    const candidates = await api(overseas, admin.overseasAccessToken, 'GET',
+      `/api/platform/v1/last-leg/dispatches/candidates?orderNo=${encodeURIComponent(relabelNo)}&sourceStage=RECEIVED`)
+    const rows = candidates.filter((value) => value.sourceStage === 'RELABEL'
+      && String(value.orderRefs || '').split(',').includes(relabelNo))
+    assert(rows.length === 2, `Expected two relabel dispatch candidates, got ${rows.length}`)
+    assert(rows.every((value) => Number(value.packageCount) > 0), 'A dispatch candidate has no packages')
+    step('Verified smart-dispatch candidates', {
+      pallets: rows.map((value) => ({ warehousePalletId: id(value.warehousePalletId), palletNo: value.palletNo,
+        packageCount: Number(value.packageCount) })),
+    })
+
+    dispatch = await api(overseas, admin.overseasAccessToken, 'POST',
+      '/api/platform/v1/last-leg/dispatches/pre-arrange', {
+        planPalletIds: rows.map((value) => id(value.warehousePalletId)),
+        route: marker,
+        relabelNo,
+      })
+    assert(dispatch.dispatchNo, 'Pre-dispatch did not return a dispatch number')
+    step('Created smart pre-dispatch', { dispatchNo: dispatch.dispatchNo, status: dispatch.status })
+  }
+
+  const sourceReport = resolve('reports', `${marker}-source.json`)
+  const fulfillmentReport = resolve('reports', `${marker}-fulfillment.json`)
+  await writeFile(sourceReport, JSON.stringify({ marker, passed: true, scenarios: [{
+    name: 'SPLIT-TWO-TARGETS', relabelNo, dispatchNo: dispatch.dispatchNo,
+  }] }, null, 2), 'utf8')
+  const child = spawnSync(process.execPath, [resolve('scripts', 'overseas-relabel-fulfillment-acceptance.mjs')], {
+    cwd: resolve('.'),
+    stdio: 'inherit',
+    env: {
+      ...process.env,
+      ADMIN_TEST_GATEWAY: domestic,
+      ADMIN_OVERSEAS_GATEWAY: overseas,
+      ADMIN_OVERSEAS_ACCESS_TOKEN: admin.overseasAccessToken,
+      MERCHANT_OVERSEAS_ACCESS_TOKEN: merchant.overseasAccessToken,
+      PDA_OVERSEAS_ACCESS_TOKEN: pda.token,
+      OVERSEAS_TEST_CUSTOMER_ID: customerId,
+      OVERSEAS_ACCEPTANCE_SOURCE: sourceReport,
+      OVERSEAS_FULFILLMENT_OUTPUT: fulfillmentReport,
+    },
+  })
+  if (child.error) throw child.error
+  if (child.status !== 0) throw new Error(`Fulfillment acceptance failed with exit code ${child.status}`)
+
+  const finalTransfer = await api(overseas, merchant.overseasAccessToken, 'GET',
+    `/api/merchant/v1/last-leg/warehouse-transfers/${transferNo}`)
+  Object.assign(report, {
+    passed: true,
+    dispatchNo: dispatch.dispatchNo,
+    transferStatus: finalTransfer.status,
+    fulfillmentReport,
+    finishedAt: new Date().toISOString(),
+  })
+} catch (error) {
+  report.error = error instanceof Error ? error.message : String(error)
+  report.finishedAt = new Date().toISOString()
+  throw error
+} finally {
+  if (admin?.accessToken && pda?.membershipId) {
+    try {
+      await api(domestic, admin.accessToken, 'PUT', `/api/platform/v1/iam/users/${pda.membershipId}/status`, {
+        status: 'DISABLED',
+      })
+      report.pdaCleanup = 'DISABLED'
+    } catch (error) {
+      report.pdaCleanup = `FAILED: ${error instanceof Error ? error.message : String(error)}`
+    }
+  }
+  await writeFile(output, JSON.stringify(report, null, 2), 'utf8')
+}
+
+console.log(JSON.stringify(report, null, 2))
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/InternalWarehousePalletController.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/InternalWarehousePalletController.java
index 736dce6a7..a8a09f61e 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/InternalWarehousePalletController.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/controller/InternalWarehousePalletController.java
@@ -33,7 +33,7 @@ public class InternalWarehousePalletController {
         @RequestHeader(value = "X-Internal-Service-Token", required = false) String token,
         @Valid @RequestBody RelabelPalletRequests.Ensure request) {
         tokenGuard.verify(token);
-        return ApiResponse.success(service.ensureRelabelPallet(request.warehouseId(), request.businessId()));
+        return ApiResponse.success(service.ensureRelabelPallet(request.warehouseId(), request.businessId(), request.fbaWarehouseCode()));
     }
 
     @GetMapping("/resolve/{palletCode}")
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/dto/RelabelPalletRequests.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/dto/RelabelPalletRequests.java
index 43bc003b7..365575d59 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/dto/RelabelPalletRequests.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/dto/RelabelPalletRequests.java
@@ -8,5 +8,6 @@ public final class RelabelPalletRequests {
     private RelabelPalletRequests() { }
 
     public record Ensure(@Positive long warehouseId,
-                         @NotBlank @Size(max = 128) String businessId) { }
+                         @NotBlank @Size(max = 128) String businessId,
+                         @Size(max = 128) String fbaWarehouseCode) { }
 }
diff --git a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
index afebff049..2c6741aed 100644
--- a/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
+++ b/warehouse-overseas-service/src/main/java/com/baiyue/warehouse/service/WarehouseResourceService.java
@@ -118,13 +118,20 @@ public class WarehouseResourceService {
 
     @Transactional
     public WarehousePalletResolveResponse ensureRelabelPallet(long warehouseId, String businessId) {
+        return ensureRelabelPallet(warehouseId, businessId, null);
+    }
+
+    @Transactional
+    public WarehousePalletResolveResponse ensureRelabelPallet(long warehouseId, String businessId,
+                                                               String fbaWarehouseCode) {
         String normalizedBusinessId = businessId == null ? null : businessId.trim();
+        String normalizedFbaWarehouseCode = StringUtils.hasText(fbaWarehouseCode) ? fbaWarehouseCode.trim() : null;
         WarehousePalletBindingEntity existing = repository.findPalletBinding(PUBLIC_RESOURCE_SCOPE, warehouseId,
             "RELABEL_PDA_NEW", normalizedBusinessId);
-        if (existing != null) return resolvePublicPallet(existing.getPalletId());
+        if (existing != null) return requireRelabelPalletDestination(existing.getPalletId(), normalizedFbaWarehouseCode);
         Long palletId = createPallet(PUBLIC_RESOURCE_SCOPE, warehouseId,
             new PalletRequests.SaveRequest(null, "STANDARD", null, java.math.BigDecimal.ZERO, "IDLE", null,
-                "PDA换标拆托新托盘"));
+                "PDA换标拆托新托盘", normalizedFbaWarehouseCode));
         WarehousePalletBindingEntity binding = new WarehousePalletBindingEntity();
         binding.setId(IdWorker.getId()); binding.setCustomerId(PUBLIC_RESOURCE_SCOPE); binding.setWarehouseId(warehouseId);
         binding.setBusinessType("RELABEL_PDA_NEW"); binding.setBusinessId(normalizedBusinessId); binding.setPalletId(palletId);
@@ -136,10 +143,19 @@ public class WarehouseResourceService {
             WarehousePalletBindingEntity winner = repository.findPalletBinding(PUBLIC_RESOURCE_SCOPE, warehouseId,
                 "RELABEL_PDA_NEW", normalizedBusinessId);
             if (winner == null) throw duplicate;
-            return resolvePublicPallet(winner.getPalletId());
+            return requireRelabelPalletDestination(winner.getPalletId(), normalizedFbaWarehouseCode);
         }
     }
 
+    private WarehousePalletResolveResponse requireRelabelPalletDestination(long palletId, String fbaWarehouseCode) {
+        WarehousePalletResolveResponse pallet = resolvePublicPallet(palletId);
+        if (fbaWarehouseCode != null && !fbaWarehouseCode.equalsIgnoreCase(
+            java.util.Objects.toString(pallet.fbaWarehouseCode(), ""))) {
+            throw new BizException(ResultCode.CONFLICT, "换标新托盘的 FBA 目的仓与当前申请不一致");
+        }
+        return pallet;
+    }
+
     /**
      * Returns the warehouse-scoped virtual location used only as a pallet/inventory reference.
      * It is deliberately never made IDLE/OCCUPIED by resource locking.

From de5b1fa889c04c443781ef2df9bdaaeb3c07daa6 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sun, 20 Sep 2026 15:06:56 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E8=B4=B4=E6=A0=87=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=82=A8=E8=BD=AC=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...astleg-relabel-return-transfer-columns.sql | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 scripts/db/test-lastleg-relabel-return-transfer-columns.sql

diff --git a/scripts/db/test-lastleg-relabel-return-transfer-columns.sql b/scripts/db/test-lastleg-relabel-return-transfer-columns.sql
new file mode 100644
index 000000000..73607fa31
--- /dev/null
+++ b/scripts/db/test-lastleg-relabel-return-transfer-columns.sql
@@ -0,0 +1,56 @@
+-- 本地与 test 结构比对（2026-09-20）：仅补 test 缺失的贴标/退货换标字段。
+-- 执行前连接到预期的 test MySQL；本脚本只作用于尾程业务库，不修改连接配置或其他 schema。
+-- MySQL 8；可重复执行。DDL 会隐式提交，遇错应停止执行，不使用 mysql --force。
+USE `baiyue_lastleg`;
+
+-- 贴标 PDA：一次 SKU 扫描可登记多件；旧记录保持默认数量 1。
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE()
+          AND table_name = 'll_relabel_pda_unit_fact' AND column_name = 'quantity'),
+  'SELECT 1',
+  'ALTER TABLE `ll_relabel_pda_unit_fact` ADD COLUMN `quantity` INT NOT NULL DEFAULT 1 COMMENT ''本次事实处理件数，箱级作业固定为1'' AFTER `reason`'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 退货签收和库存箱记录来源托盘。
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE()
+          AND table_name = 'll_return_receipt' AND column_name = 'pallet_code'),
+  'SELECT 1',
+  'ALTER TABLE `ll_return_receipt` ADD COLUMN `pallet_code` VARCHAR(128) NULL COMMENT ''本次签收绑定的托盘码'' AFTER `receipt_batch_no`'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE()
+          AND table_name = 'll_return_inventory_carton' AND column_name = 'pallet_code'),
+  'SELECT 1',
+  'ALTER TABLE `ll_return_inventory_carton` ADD COLUMN `pallet_code` VARCHAR(128) NULL COMMENT ''签收时绑定的托盘码'' AFTER `source_return_no`'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 退货单手动差异完结的审计字段。
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE()
+          AND table_name = 'll_return_order' AND column_name = 'discrepancy_reason'),
+  'SELECT 1',
+  'ALTER TABLE `ll_return_order` ADD COLUMN `discrepancy_reason` VARCHAR(500) NULL COMMENT ''手动完结差异原因'' AFTER `remark`'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE()
+          AND table_name = 'll_return_order' AND column_name = 'manually_completed_at'),
+  'SELECT 1',
+  'ALTER TABLE `ll_return_order` ADD COLUMN `manually_completed_at` DATETIME(3) NULL COMMENT ''手动差异完结时间'' AFTER `discrepancy_reason`'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 预期返回 5；低于 5 表示本次补齐不完整。
+SELECT DATABASE() AS target_schema, COUNT(*) AS aligned_column_count
+FROM information_schema.columns
+WHERE table_schema = DATABASE()
+  AND (table_name = 'll_relabel_pda_unit_fact' AND column_name = 'quantity'
+    OR table_name = 'll_return_receipt' AND column_name = 'pallet_code'
+    OR table_name = 'll_return_inventory_carton' AND column_name = 'pallet_code'
+    OR table_name = 'll_return_order' AND column_name IN ('discrepancy_reason', 'manually_completed_at'));

From 75c2bd092ffddd786749248e4d781d9a3debee54 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 15:39:37 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../returnreceipt/service/ReturnInventoryServiceTest.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
index 0847e016d..e1adb845e 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
@@ -107,6 +107,7 @@ class ReturnInventoryServiceTest {
         ReturnReceipt receipt = new ReturnReceipt();
         receipt.setId(21L);
         receipt.setReceiptBatchNo("RB-1");
+        receipt.setPalletCode("PAL-RETURN-1");
         when(numbers.next(anyString(), anyString(), anyLong())).thenReturn("RC-1");
 
         service.createReceiptCarton(order, receipt, null,

From 0dec690235412f6fe9e74e976a13b0c6714753b1 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 15:49:29 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IamCustomerSnapshotService.java   | 13 ++++++++++++
 .../InboundCartonLabelPrintService.java       |  2 +-
 .../InboundCartonLabelPrintServiceTest.java   | 20 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/IamCustomerSnapshotService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/IamCustomerSnapshotService.java
index fa64873bf..56899cc30 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/IamCustomerSnapshotService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/IamCustomerSnapshotService.java
@@ -52,4 +52,17 @@ public class IamCustomerSnapshotService {
             throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "客户主数据服务暂不可用");
         }
     }
+
+    /**
+     * 打印托盘信息单时客户昵称属于展示字段，客户资料尚未补全不应阻断 PDF 生成。
+     * 下游服务不可用等基础设施错误仍然向上抛出，避免静默生成不完整数据。
+     */
+    public String customerNicknameForPrint(long customerId) {
+        try {
+            return customerNickname(customerId);
+        } catch (BizException exception) {
+            if (exception.getResultCode() == ResultCode.CONFLICT) return "—";
+            throw exception;
+        }
+    }
 }
diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
index e3148d064..c4fb97cf8 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/service/InboundCartonLabelPrintService.java
@@ -163,7 +163,7 @@ public class InboundCartonLabelPrintService {
         List<PrintPdfClient.DropshipPalletInboundRow> inboundRows = inboundFacts.stream()
             .map(row -> new PrintPdfClient.DropshipPalletInboundRow(
                 row.getInboundCode(),
-                customerNicknameCache.computeIfAbsent(row.getTenantId(), customerSnapshots::customerNickname),
+                customerNicknameCache.computeIfAbsent(row.getTenantId(), customerSnapshots::customerNicknameForPrint),
                 number(row.getCartonCount()), number(row.getItemQuantity())))
             .toList();
         String destinationWarehouse = inboundFacts.stream()
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
index ec288a2f8..0017a7a62 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
@@ -146,6 +146,26 @@ class InboundCartonLabelPrintServiceTest {
         assertThat(request.getValue().documents().get(1).skuRows()).hasSize(1);
     }
 
+    @Test
+    void printsPalletDocumentWhenCustomerNicknameIsMissing() {
+        Pallet pallet = dropshipPallet("OPEN");
+        stubPalletFacts(90001L);
+        when(customerSnapshots.customerNicknameForPrint(10001L)).thenReturn("—");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_PDF);
+        when(print.generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
+            org.mockito.ArgumentMatchers.eq("request-missing-nickname"), org.mockito.ArgumentMatchers.any()))
+            .thenReturn(new ResponseEntity<>(new byte[] {1}, headers, org.springframework.http.HttpStatus.OK));
+
+        service.generateDropshipPallet(pallet, "PCHK2608040174", "request-missing-nickname");
+
+        ArgumentCaptor<PrintPdfClient.DropshipPalletA4PdfRequest> request =
+            ArgumentCaptor.forClass(PrintPdfClient.DropshipPalletA4PdfRequest.class);
+        verify(print).generateDropshipPalletA4Documents(org.mockito.ArgumentMatchers.anyString(),
+            org.mockito.ArgumentMatchers.eq("request-missing-nickname"), request.capture());
+        assertThat(request.getValue().documents().get(0).inboundRows().get(0).customerNickname()).isEqualTo("—");
+    }
+
     @Test
     void forwardsStableLabelsWithoutSkuAndOnlySafePdfHeaders() throws Exception {
         when(labels.list(10001L, 70001L, List.of(1))).thenReturn(batch());

From cb008ad64de54e87b1c2fa183a931a321490f9cf Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 15:57:51 +0800
Subject: [PATCH 15/26] test(firstleg): cover printable pallet without nickname

---
 .../firstleg/service/IamCustomerSnapshotServiceTest.java  | 8 ++++++++
 .../service/InboundCartonLabelPrintServiceTest.java       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/IamCustomerSnapshotServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/IamCustomerSnapshotServiceTest.java
index e1d8457e9..2f4871954 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/IamCustomerSnapshotServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/IamCustomerSnapshotServiceTest.java
@@ -66,4 +66,12 @@ class IamCustomerSnapshotServiceTest {
 
         assertThat(service.customerNickname(7L)).isEqualTo("Short Name");
     }
+
+    @Test
+    void usesPlaceholderForPrintWhenCustomerNicknameIsMissing() {
+        when(client.page("internal-token", 1, 2, null, null, 7L))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(), 1, 2, 0, 0)));
+
+        assertThat(service.customerNicknameForPrint(7L)).isEqualTo("—");
+    }
 }
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
index 0017a7a62..ee0c475f9 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/service/InboundCartonLabelPrintServiceTest.java
@@ -320,6 +320,6 @@ class InboundCartonLabelPrintServiceTest {
         sku.setMaxUnitsPerCarton(19);
         when(palletization.printSkuRows(palletId))
             .thenReturn(palletId == 90001L ? List.of(sku) : List.of());
-        when(customerSnapshots.customerNickname(10001L)).thenReturn("小虫科技");
+        when(customerSnapshots.customerNicknameForPrint(10001L)).thenReturn("小虫科技");
     }
 }

From 2ce2fff8d7d435f56153e9a138b8d7b5ffe88a9f Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 16:10:01 +0800
Subject: [PATCH 16/26] fix: map sealed pallet cartons to physical pallet

---
 .../firstleg/mapper/LoadingPickItemMapper.java      |  4 ++++
 .../LoadingPickPdaTaskSqlContractTest.java          | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
index be2eb98fd..5ce20ed4c 100644
--- a/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
+++ b/firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingPickItemMapper.java
@@ -32,6 +32,10 @@ public interface LoadingPickItemMapper extends BaseMapper<LoadingPickItemEntity>
             AND label.inbound_id = plan_item.inbound_id
             AND label.inbound_detail_id = plan_item.inbound_detail_id
             AND label.batch_status = 'ACTIVE'
+            AND (plan_item.unit_type <> 'SEALED_PALLET'
+              OR EXISTS (SELECT 1 FROM fl_dropship_pallet_carton pallet_carton
+                          WHERE pallet_carton.pallet_id = plan_item.pallet_id
+                            AND pallet_carton.carton_label_id = label.id))
          WHERE pick_item.pick_task_id = #{taskId} AND plan_item.deleted = 0
          ORDER BY pick_item.id, label.carton_index
         """)
diff --git a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
index 20799bb0b..33025c9b1 100644
--- a/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
+++ b/firstleg/src/test/java/com/baiyue/firstleg/repository/LoadingPickPdaTaskSqlContractTest.java
@@ -73,6 +73,19 @@ class LoadingPickPdaTaskSqlContractTest {
             .contains("label.box_code AS boxCode");
     }
 
+    @Test
+    void sealedPalletCartonsAreRestrictedToTheirPhysicalPalletMembership() throws Exception {
+        String sql = LoadingPickItemMapper.class
+            .getDeclaredMethod("selectTaskCartonLabels", long.class)
+            .getAnnotation(Select.class).value()[0];
+
+        assertThat(sql)
+            .contains("plan_item.unit_type <> 'SEALED_PALLET'")
+            .contains("fl_dropship_pallet_carton pallet_carton")
+            .contains("pallet_carton.pallet_id = plan_item.pallet_id")
+            .contains("pallet_carton.carton_label_id = label.id");
+    }
+
     @Test
     void taskDetailResolvesOnlyTheActiveBookingOwnedByItsCurrentPlan() throws Exception {
         String sql = LoadingPickTaskMapper.class

From 82ff6589cb7f49c4172233bca69b4d5ab5e57874 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Sun, 20 Sep 2026 16:55:55 +0800
Subject: [PATCH 17/26] =?UTF-8?q?=E8=B4=B4=E6=A0=87=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=93=E5=82=A8=E8=BD=AC=E8=BF=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/sql/头程数据库统一增量-MySQL8.sql      |  2 +-
 .../main/resources/db/lastleg-permissions.sql |  2 +-
 ...seasCustomerPermissionSqlContractTest.java |  1 +
 .../MerchantReturnOrderController.java        | 10 +++++++
 .../openapi/overseas-business-v1.yaml         | 11 ++++++++
 ...rchantOverseasCustomerApiContractTest.java |  1 +
 .../MerchantOverseasOpenApiContractTest.java  |  3 ++-
 .../service/ReturnReceiptServiceTest.java     | 26 +++++++++++++++++++
 8 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/deploy/sql/头程数据库统一增量-MySQL8.sql b/deploy/sql/头程数据库统一增量-MySQL8.sql
index 9d1ddbd2f..d4f4fcce5 100644
--- a/deploy/sql/头程数据库统一增量-MySQL8.sql
+++ b/deploy/sql/头程数据库统一增量-MySQL8.sql
@@ -6364,7 +6364,7 @@ INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id,
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306180,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:discard:list','货物废弃','/overseas-warehouse/cargo-disposal','GET',130,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306181,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:create','创建货物废弃申请',NULL,'POST',10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306182,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:cancel','取消货物废弃申请',NULL,'POST',20,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
-INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306190,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:return-order:list','退货预报','/overseas-warehouse/return-relabel','GET',140,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
+INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306190,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:return-order:list','退货换标','/overseas-warehouse/return-relabel','GET',140,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306191,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:create','创建退货预报',NULL,'POST',10,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 INSERT INTO iam_permission (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name, route_path, http_method, sort_no, status, built_in, created_at, updated_at, deleted) VALUES (5306192,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:relabel','退货转换标申请',NULL,'POST',20,'ACTIVE',1,CURRENT_TIMESTAMP(3),CURRENT_TIMESTAMP(3),0);
 
diff --git a/iam/src/main/resources/db/lastleg-permissions.sql b/iam/src/main/resources/db/lastleg-permissions.sql
index 69ba4426e..cc2641888 100644
--- a/iam/src/main/resources/db/lastleg-permissions.sql
+++ b/iam/src/main/resources/db/lastleg-permissions.sql
@@ -99,7 +99,7 @@ VALUES
   (5306180,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:discard:list','货物废弃','/overseas-warehouse/cargo-disposal','GET',130,'ACTIVE',1,0),
   (5306181,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:create','创建货物废弃申请',NULL,'POST',10,'ACTIVE',1,0),
   (5306182,0,'MERCHANT','BUTTON',5306180,'merchant:overseas-warehouse:discard:cancel','取消货物废弃申请',NULL,'POST',20,'ACTIVE',1,0),
-  (5306190,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:return-order:list','退货预报','/overseas-warehouse/return-relabel','GET',140,'ACTIVE',1,0),
+  (5306190,0,'MERCHANT','MENU',0,'merchant:overseas-warehouse:return-order:list','退货换标','/overseas-warehouse/return-relabel','GET',140,'ACTIVE',1,0),
   (5306191,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:create','创建退货预报',NULL,'POST',10,'ACTIVE',1,0),
   (5306192,0,'MERCHANT','BUTTON',5306190,'merchant:overseas-warehouse:return-order:relabel','退货转换标申请',NULL,'POST',20,'ACTIVE',1,0)
 ON DUPLICATE KEY UPDATE permission_type=VALUES(permission_type), parent_id=VALUES(parent_id),
diff --git a/iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java b/iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java
index 9874d5f52..ba27c34e8 100644
--- a/iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java
+++ b/iam/src/test/java/com/baiyue/iam/repository/OverseasCustomerPermissionSqlContractTest.java
@@ -51,6 +51,7 @@ class OverseasCustomerPermissionSqlContractTest {
             "'merchant:cross-border:pallet-shipping:list','美本土散板','/cross-border/pallet-shipping'",
             "'merchant:warehouse:inbound:list','海外仓入库订单','/orders/inbound'",
             "'merchant:overseas-warehouse:return-inventory:list','退货库存','/overseas-warehouse/return-inventory'",
+            "'merchant:overseas-warehouse:return-order:list','退货换标','/overseas-warehouse/return-relabel'",
             "'merchant:overseas-warehouse:relabel:files','管理贴标文件'",
             "'merchant:overseas-warehouse:discard:cancel','取消货物废弃申请'");
     }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnOrderController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnOrderController.java
index d5628de57..09e870bb6 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnOrderController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/controller/MerchantReturnOrderController.java
@@ -10,6 +10,8 @@ import com.baiyue.lastleg.security.OverseasPermissions;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -28,6 +30,14 @@ public class MerchantReturnOrderController {
     @GetMapping("/{returnNo}") @PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_RETURN_ORDER_LIST + "')")
     public ApiResponse<ReturnOrderResponses.Detail> detail(@AuthenticationPrincipal AuthenticatedUser user,
         @PathVariable String returnNo) { return ApiResponse.success(service.detail(customer(user), returnNo)); }
+    @GetMapping("/{returnNo}/photos/files/{fileId}/download")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_RETURN_ORDER_LIST + "')")
+    public ResponseEntity<byte[]> downloadPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String returnNo, @PathVariable long fileId) {
+        var file = service.downloadPhoto(customer(user), returnNo, fileId);
+        return ResponseEntity.ok().contentType(MediaType.parseMediaType(file.contentType()))
+            .header("Cache-Control", "no-store").body(file.content());
+    }
     @GetMapping("/{returnNo}/relabel-candidates") @PreAuthorize("hasAuthority('" + OverseasPermissions.MERCHANT_RETURN_ORDER_RELABEL + "')")
     public ApiResponse<java.util.List<ReturnOrderResponses.RelabelCandidate>> relabelCandidates(
         @AuthenticationPrincipal AuthenticatedUser user, @PathVariable String returnNo) {
diff --git a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
index c0d00b457..dbdbcfe8b 100644
--- a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
+++ b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
@@ -1516,6 +1516,17 @@ paths:
       security: [{ bearerAuth: [] }]
       parameters: [{ name: returnNo, in: path, required: true, schema: { type: string } }]
       responses: { '200': { description: 当前客户退货订单详情 }, '404': { description: 当前客户下退货订单不存在 } }
+  /api/merchant/v1/last-leg/return-orders/{returnNo}/photos/files/{fileId}/download:
+    get:
+      summary: 客户下载退货签收打托照片
+      description: 权限 merchant:overseas-warehouse:return-order:list；仅允许下载当前客户、当前退货单关联的签收照片，响应为原始文件且禁止缓存。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: returnNo, in: path, required: true, schema: { type: string } }
+        - { name: fileId, in: path, required: true, schema: { type: integer, format: int64 } }
+      responses:
+        '200': { description: 照片文件, content: { image/*: { schema: { type: string, format: binary } } } }
+        '404': { description: 当前客户下退货单或关联照片不存在 }
   /api/merchant/v1/last-leg/return-orders/{returnNo}/relabel-candidates:
     get:
       summary: 查询退货单可转换标候选
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasCustomerApiContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasCustomerApiContractTest.java
index c9092655e..c547cb562 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasCustomerApiContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasCustomerApiContractTest.java
@@ -87,6 +87,7 @@ class MerchantOverseasCustomerApiContractTest {
             "create", OverseasPermissions.MERCHANT_RETURN_ORDER_CREATE,
             "page", OverseasPermissions.MERCHANT_RETURN_ORDER_LIST,
             "detail", OverseasPermissions.MERCHANT_RETURN_ORDER_LIST,
+            "downloadPhoto", OverseasPermissions.MERCHANT_RETURN_ORDER_LIST,
             "relabelCandidates", OverseasPermissions.MERCHANT_RETURN_ORDER_RELABEL,
             "createRelabel", OverseasPermissions.MERCHANT_RETURN_ORDER_RELABEL));
         assertPermissions(MerchantRelabelApplicationController.class, Map.of(
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasOpenApiContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasOpenApiContractTest.java
index 28d124284..0d3e23529 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasOpenApiContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/merchant/MerchantOverseasOpenApiContractTest.java
@@ -32,7 +32,8 @@ class MerchantOverseasOpenApiContractTest {
             "/api/merchant/v1/last-leg/local-looseboard-orders:",
             "/api/merchant/v1/last-leg/local-looseboard-orders/{orderNo}:",
             "/api/merchant/v1/last-leg/inbound-plans:",
-            "/api/merchant/v1/last-leg/inbound-plans/{planNo}:"}) {
+            "/api/merchant/v1/last-leg/inbound-plans/{planNo}:",
+            "/api/merchant/v1/last-leg/return-orders/{returnNo}/photos/files/{fileId}/download:"}) {
             assertThat(yaml).contains(path);
             assertThat(pathBlock(yaml, path)).doesNotContain("name: customerId");
         }
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
index fab443c9d..2bc877ac7 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnReceiptServiceTest.java
@@ -22,6 +22,7 @@ import com.baiyue.lastleg.relabel.mapper.RelabelApplicationMapper;
 import com.baiyue.lastleg.relabel.mapper.RelabelItemMapper;
 import com.baiyue.lastleg.relabel.entity.RelabelApplication;
 import com.baiyue.lastleg.relabel.entity.RelabelItem;
+import com.baiyue.lastleg.relabel.pda.gateway.RelabelPhotoFileGateway;
 import com.baiyue.lastleg.service.FbaWarehouseValidator;
 import com.baiyue.lastleg.service.LastlegOrderNoGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -67,6 +68,7 @@ class ReturnReceiptServiceTest {
     @Mock RelabelApplicationMapper relabelApplications;
     @Mock RelabelItemMapper relabelItems;
     @Mock FbaWarehouseValidator fbaWarehouseValidator;
+    @Mock RelabelPhotoFileGateway photoFiles;
 
     ReturnReceiptService service;
     PdaWarehouseIdentity identity;
@@ -91,6 +93,30 @@ class ReturnReceiptServiceTest {
         identity = new PdaWarehouseIdentity("operator-1", "仓管员", 10L);
     }
 
+    @Test
+    void merchantPhotoDownloadUsesAuthenticatedCustomerAndResolvedReturnOrder() {
+        ReflectionTestUtils.setField(service, "photoFiles", photoFiles);
+        ReturnOrder order = order("RT-1", "10", ReturnReceiptService.COMPLETED, 2, 2);
+        var downloaded = new RelabelPhotoFileGateway.DownloadedFile(new byte[] { 1, 2 }, "proof.jpg", "image/jpeg");
+        when(orders.findNo("customer-1", "RT-1")).thenReturn(order);
+        when(photoFiles.download("customer-1", 1L, 99L)).thenReturn(downloaded);
+
+        assertEquals(downloaded, service.downloadPhoto("customer-1", "RT-1", 99L));
+        verify(photoFiles).download("customer-1", 1L, 99L);
+    }
+
+    @Test
+    void merchantPhotoDownloadRejectsUnknownCustomerOrderBeforeFileAccess() {
+        ReflectionTestUtils.setField(service, "photoFiles", photoFiles);
+        when(orders.findNo("other-customer", "RT-1")).thenReturn(null);
+
+        ResponseStatusException error = assertThrows(ResponseStatusException.class,
+            () -> service.downloadPhoto("other-customer", "RT-1", 99L));
+
+        assertEquals(404, error.getStatusCode().value());
+        verifyNoInteractions(photoFiles);
+    }
+
     @Test
     void multiSkuPartialRelabelLocksOnlyRequestedQuantities() {
         verifyMultiSkuRelabel(30, 15);

From 0fef9a8133a41b9024ab8c0532a23ad0afaffe98 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 18:12:48 +0800
Subject: [PATCH 18/26] fix(pda): allow receiving photo lookup by container

---
 .../ReceivingContainerController.java         | 26 +++++++++++
 .../ReceivingContainerSessionMapper.java      |  4 ++
 .../service/ReceivingContainerService.java    | 43 ++++++++++++++++++-
 .../openapi/overseas-business-v1.yaml         | 22 ++++++++++
 .../pda/ReceivingContainerContractTest.java   |  2 +
 5 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
index d80e315d5..c6ddb022d 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/ReceivingContainerController.java
@@ -95,6 +95,19 @@ public class ReceivingContainerController {
             .contentLength(download.content().length).body(download.content());
     }
 
+    @GetMapping("/{containerNo}/unload-photos/files/{fileId}/download")
+    public ResponseEntity<byte[]> downloadContainerPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+                                                         @PathVariable String containerNo,
+                                                         @PathVariable String fileId) {
+        PdaWarehouseIdentity identity = identity(user);
+        var download = service.downloadContainerPhoto(identity.overseasWarehouseId(), containerNo, fileId);
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore())
+            .header(HttpHeaders.CONTENT_DISPOSITION,
+                ContentDisposition.inline().filename(download.fileName(), StandardCharsets.UTF_8).build().toString())
+            .contentType(MediaType.parseMediaType(download.contentType()))
+            .contentLength(download.content().length).body(download.content());
+    }
+
     @GetMapping("/current/domestic-loading-photos/{evidenceType}/content")
     public ResponseEntity<byte[]> downloadDomesticLoadingPhoto(@AuthenticationPrincipal AuthenticatedUser user,
                                                                 @PathVariable String evidenceType) {
@@ -107,6 +120,19 @@ public class ReceivingContainerController {
             .contentLength(download.content().length).body(download.content());
     }
 
+    @GetMapping("/{containerNo}/domestic-loading-photos/{evidenceType}/content")
+    public ResponseEntity<byte[]> downloadContainerDomesticLoadingPhoto(@AuthenticationPrincipal AuthenticatedUser user,
+                                                                         @PathVariable String containerNo,
+                                                                         @PathVariable String evidenceType) {
+        PdaWarehouseIdentity identity = identity(user);
+        var download = service.downloadContainerDomesticLoadingPhoto(identity.overseasWarehouseId(), containerNo, evidenceType);
+        return ResponseEntity.ok().cacheControl(CacheControl.noStore())
+            .header(HttpHeaders.CONTENT_DISPOSITION,
+                ContentDisposition.inline().filename(download.fileName(), StandardCharsets.UTF_8).build().toString())
+            .contentType(MediaType.parseMediaType(download.contentType()))
+            .contentLength(download.content().length).body(download.content());
+    }
+
     @PostMapping("/current/sign")
     public ApiResponse<ReceivingContainerResponses.Session> sign(@AuthenticationPrincipal AuthenticatedUser user,
         @Valid @RequestBody ReceivingContainerRequests.Sign request) {
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingContainerSessionMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingContainerSessionMapper.java
index 0cfc25de9..4c6697f14 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingContainerSessionMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/mapper/ReceivingContainerSessionMapper.java
@@ -22,6 +22,10 @@ public interface ReceivingContainerSessionMapper extends BaseMapper<ReceivingCon
         "WHERE active_container_key=#{activeContainerKey} LIMIT 1")
     ReceivingContainerSession findActiveByContainer(@Param("activeContainerKey") String activeContainerKey);
 
+    @Select("SELECT * FROM ll_receiving_container_session " +
+        "WHERE container_no=#{containerNo} ORDER BY created_at DESC LIMIT 1")
+    ReceivingContainerSession findLatestByContainerNo(@Param("containerNo") String containerNo);
+
     @Select("SELECT * FROM ll_receiving_container_session WHERE active_container_key IS NOT NULL")
     List<ReceivingContainerSession> findActiveContainers();
 
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
index 2c3b85714..63ed8f26a 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerService.java
@@ -70,8 +70,12 @@ public class ReceivingContainerService {
     private static final String PLATFORM_SCOPE = "0";
     private static final String PHOTO_DOWNLOAD_PATH =
         "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/{fileId}/download";
+    private static final String CONTAINER_PHOTO_DOWNLOAD_PATH =
+        "/api/pda/v1/last-leg/receiving-containers/{containerNo}/unload-photos/files/{fileId}/download";
     private static final String DOMESTIC_PHOTO_DOWNLOAD_PATH =
         "/api/pda/v1/last-leg/receiving-containers/current/domestic-loading-photos/{type}/content";
+    private static final String CONTAINER_DOMESTIC_PHOTO_DOWNLOAD_PATH =
+        "/api/pda/v1/last-leg/receiving-containers/{containerNo}/domestic-loading-photos/{type}/content";
     private static final String PALLET_MERGE_HINT =
         "该入库计划可选择合托：合托时扫描同目的仓已使用的托盘码，独立收货时扫描新托盘码；不强制合托";
     private static final int MAX_PACKAGES_PER_PALLET = 66;
@@ -275,6 +279,39 @@ public class ReceivingContainerService {
         return domesticEvidenceFiles.download(bookingId, evidence.getSourceFileId());
     }
 
+    public UnloadPhotoFileGateway.DownloadedFile downloadContainerPhoto(
+        long overseasWarehouseId, String containerNo, String fileId) {
+        ReceivingContainerSession session = requireContainerPhotoSession(overseasWarehouseId, containerNo);
+        long parsedFileId = positiveFileId(fileId);
+        if (signedPhotos(session).stream().noneMatch(photo -> fileId.equals(photo.fileId()))) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "该柜没有对应的卸柜照片");
+        }
+        return unloadPhotos.download(PLATFORM_SCOPE, session.getId(), parsedFileId);
+    }
+
+    public DomesticLoadingEvidenceGateway.DownloadedFile downloadContainerDomesticLoadingPhoto(
+        long overseasWarehouseId, String containerNo, String evidenceType) {
+        ReceivingContainerSession session = requireContainerPhotoSession(overseasWarehouseId, containerNo);
+        String type = requiredEvidenceType(evidenceType);
+        var evidence = domesticEvidence.find(session.getSourceContainerBookingId(), type);
+        if (evidence == null) throw notFound("当前柜没有该国内装柜照片");
+        long bookingId;
+        try { bookingId = Long.parseLong(session.getSourceContainerBookingId()); }
+        catch (NumberFormatException exception) { throw new ResponseStatusException(
+            HttpStatus.SERVICE_UNAVAILABLE, "当前柜国内照片来源无效", exception); }
+        return domesticEvidenceFiles.download(bookingId, evidence.getSourceFileId());
+    }
+
+    private ReceivingContainerSession requireContainerPhotoSession(long overseasWarehouseId, String containerNo) {
+        String value = trim(containerNo);
+        if (value == null) throw notFound("柜号不能为空");
+        ReceivingContainerSession session = sessions.findLatestByContainerNo(value);
+        if (session == null || !Objects.equals(session.getOverseasWarehouseId(), overseasWarehouseId)) {
+            throw notFound("当前仓没有该柜的照片");
+        }
+        return session;
+    }
+
     public void requireCurrentWarehouse(String operatorKey, long overseasWarehouseId) {
         requireSessionWarehouse(sessions.findActiveByOperator(activeOperatorKey(operatorKey)), overseasWarehouseId);
     }
@@ -1050,7 +1087,8 @@ public class ReceivingContainerService {
         if (bookingId == null) return List.of();
         return domesticEvidence.listByContainer(bookingId).stream()
             .map(value -> new ReceivingContainerResponses.DomesticLoadingPhoto(value.getEvidenceType(),
-                evidenceLabel(value.getEvidenceType()), DOMESTIC_PHOTO_DOWNLOAD_PATH.replace("{type}", value.getEvidenceType())))
+                evidenceLabel(value.getEvidenceType()), CONTAINER_DOMESTIC_PHOTO_DOWNLOAD_PATH
+                    .replace("{containerNo}", session.getContainerNo()).replace("{type}", value.getEvidenceType())))
             .toList();
     }
 
@@ -1384,7 +1422,8 @@ public class ReceivingContainerService {
     private List<ReceivingContainerResponses.SignedPhoto> signPhotos(ReceivingContainerSession session) {
         return signedPhotos(session).stream()
             .map(photo -> new ReceivingContainerResponses.SignedPhoto(photo.role(), photo.fileId(),
-                PHOTO_DOWNLOAD_PATH.replace("{fileId}", photo.fileId())))
+                CONTAINER_PHOTO_DOWNLOAD_PATH.replace("{containerNo}", session.getContainerNo())
+                    .replace("{fileId}", photo.fileId())))
             .toList();
     }
 
diff --git a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
index dbdbcfe8b..0af7a9337 100644
--- a/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
+++ b/lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
@@ -84,6 +84,17 @@ paths:
             application/octet-stream: { schema: { type: string, format: binary } }
         '403': { description: fileId 未绑定到当前操作员的当前柜会话三类签收照片 }
         '404': { description: 当前柜会话或照片不存在 }
+  /api/pda/v1/last-leg/receiving-containers/{containerNo}/unload-photos/files/{fileId}/download:
+    get:
+      summary: 按柜号下载卸柜签收照片
+      description: 权限 lastleg:pda:operate；按当前 PDA 绑定仓和柜号读取历史或当前柜的签收照片，不要求存在未完成接柜会话。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: containerNo, in: path, required: true, schema: { type: string } }
+        - { name: fileId, in: path, required: true, schema: { type: string, pattern: '^[1-9][0-9]{0,18}$' } }
+      responses:
+        '200': { description: 签收照片字节流, content: { image/jpeg: { schema: { type: string, format: binary } }, image/png: { schema: { type: string, format: binary } } } }
+        '404': { description: 当前仓没有该柜或照片不存在 }
   /api/pda/v1/last-leg/receiving-containers/current/domestic-loading-photos/{evidenceType}/content:
     get:
       summary: 查看当前柜国内装柜照片
@@ -100,6 +111,17 @@ paths:
             application/octet-stream: { schema: { type: string, format: binary } }
         '404': { description: 当前柜或指定类型照片不存在 }
         '503': { description: 国内照片服务暂不可用 }
+  /api/pda/v1/last-leg/receiving-containers/{containerNo}/domestic-loading-photos/{evidenceType}/content:
+    get:
+      summary: 按柜号查看国内装柜照片
+      description: 权限 lastleg:pda:operate；按当前 PDA 绑定仓和柜号读取历史或当前柜的国内装柜照片，不要求存在未完成接柜会话。
+      security: [{ bearerAuth: [] }]
+      parameters:
+        - { name: containerNo, in: path, required: true, schema: { type: string } }
+        - { name: evidenceType, in: path, required: true, schema: { type: string, enum: [PHOTO_STEP_1, PHOTO_STEP_2, PHOTO_STEP_3, PHOTO_STEP_4, SEAL] } }
+      responses:
+        '200': { description: 国内装柜照片字节流, content: { image/jpeg: { schema: { type: string, format: binary } }, image/png: { schema: { type: string, format: binary } } } }
+        '404': { description: 当前仓没有该柜或指定类型照片不存在 }
   /api/pda/v1/last-leg/receiving-containers/current/sign:
     post:
       summary: 签收当前柜
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
index 8a53f13d8..0f959bfa8 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/ReceivingContainerContractTest.java
@@ -140,6 +140,8 @@ class ReceivingContainerContractTest {
         assertTrue(yaml.contains(prefix + "/current/receipts/pallet:"));
         assertTrue(yaml.contains(prefix + "/current/complete:"));
         assertTrue(yaml.contains(prefix + "/current/unload-photos/files/{fileId}/download:"));
+        assertTrue(yaml.contains(prefix + "/{containerNo}/unload-photos/files/{fileId}/download:"));
+        assertTrue(yaml.contains(prefix + "/{containerNo}/domestic-loading-photos/{evidenceType}/content:"));
         assertFalse(yaml.contains("/api/pda/v1/last-leg/receiving-containers/{planNo}"));
         String receivingPaths = yaml.substring(yaml.indexOf(prefix), yaml.indexOf("/api/platform/v1/last-leg/orders:"));
         List<String> successResponses = receivingPaths.lines().map(String::trim)

From d8e368bf553dfb1529ae8ef007574718f170b5da Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 18:20:28 +0800
Subject: [PATCH 19/26] test(pda): update historical photo paths

---
 .../pda/service/ReceivingContainerServiceBehaviorTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
index 7aa26fc05..cb3ca9041 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/ReceivingContainerServiceBehaviorTest.java
@@ -730,9 +730,9 @@ class ReceivingContainerServiceBehaviorTest {
             .containsExactly("2092476334483931138", "2", "3");
         org.assertj.core.api.Assertions.assertThat(response.photos()).extracting("downloadPath")
             .containsExactly(
-                "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/2092476334483931138/download",
-                "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/2/download",
-                "/api/pda/v1/last-leg/receiving-containers/current/unload-photos/files/3/download");
+                "/api/pda/v1/last-leg/receiving-containers/CONT-A/unload-photos/files/2092476334483931138/download",
+                "/api/pda/v1/last-leg/receiving-containers/CONT-A/unload-photos/files/2/download",
+                "/api/pda/v1/last-leg/receiving-containers/CONT-A/unload-photos/files/3/download");
         verify(unloadPhotos).validate("0", 8L, 2092476334483931138L);
         verify(unloadPhotos).validate("0", 8L, 2L);
         verify(unloadPhotos).validate("0", 8L, 3L);

From 20a748cf7f10287d540ba89860b3494057ee7e9f Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 18:25:12 +0800
Subject: [PATCH 20/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/admin-test-env-modules/README.md      |  2 +
 ...-overseas-return-receipt-contract.test.mjs |  9 ++-
 .../phase4-overseas-return-receipt.mjs        | 79 ++++++++++++++-----
 .../return-boundary-scenarios.mjs             | 46 ++++++++---
 .../return-review-contract.test.mjs           | 41 ++++++++++
 5 files changed, 145 insertions(+), 32 deletions(-)
 create mode 100644 scripts/admin-test-env-modules/return-review-contract.test.mjs

diff --git a/scripts/admin-test-env-modules/README.md b/scripts/admin-test-env-modules/README.md
index afd844fc1..34babb109 100644
--- a/scripts/admin-test-env-modules/README.md
+++ b/scripts/admin-test-env-modules/README.md
@@ -10,6 +10,8 @@
 
 退货专项只运行 `--modules phase4-overseas-return-receipt`，自动准备本轮客户；覆盖非法/重复预报、退货单号和 SKU 查询、非法/未知 SKU 实收、超收及失败不落账、分批签收完成、部分签收禁止合箱、合箱非法箱规/数量/来源、幂等重放前后库存快照一致、逐箱分页无重复遗漏、客户 SKU 数量守恒及标签。通过显式测试环境文件运行总入口，JSON 路径由 `--output` 指定；会创建隔离测试数据，finally 停用临时 PDA，不删除业务记录。失败保留报告，先核对记录再决定是否新批次重跑。
 
+退货预报创建后为 `PENDING_REVIEW`。签收前必须通过客户详情确认归属，再经平台 `/return-orders/{returnNo}/review` 携带 `X-Customer-Id` 审核，客户回查 `PENDING_RECEIPT` 且实收为零；审核失败立即停止签收。`return-review-contract.test.mjs` 覆盖归属拒绝、审核权限失败和回查未收敛。主签收场景按单 SKU 分甲3件、乙2件两批，使用正式 PDA 退货托盘生成接口返回的 `palletCode`，不复用国内基础托盘；每批对应一个计费批次。最后一批先验证缺照片拒绝及库存不变，再上传明确为合成测试图片的 PNG 并完成签收；不把图片称为真实现场照片。边界扩展与换标后续仍需按新协议独立验证，主签收通过不能证明全部退货链通过。
+
 `return-boundary-scenarios.mjs` 是退货专项自动调用的内部扩展，不单独注册入口：本轮新建第二隔离客户，复用两个有效海外仓，覆盖跨客户单据/箱/标签/列表隔离、跨仓 PDA 隔离、两人争抢最后一件的签收及合箱、同键并发签收与成功后重试、多单同 SKU 全量合箱和实际来源追溯、耗尽箱清零、多单 SKU 候选和输入边界。异常写入逐次前后回查订单、签收批次、箱及 SKU；同键重试只模拟响应丢失后的客户端行为，不代表网络故障注入。每组并发严格为两个请求，不启动批量 worker；缺少第二仓或操作员属于失败，不能跳过后宣称通过。finally 停用新增 PDA，保留测试客户和业务记录；不触发部署、SQL、换标、出库或二次合箱。真实运行须明确授权目标环境及此小规模并发边界。`merchant-qualification-fixture.mjs` 的内部参数 `publishEnvironment: false` 只将第二客户凭据留在独立内存上下文，不覆盖主客户环境凭据，默认主 fixture 行为不变。
 
 扩展离线检查：`node --test scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs scripts/script-documentation-contract.test.mjs`。这些校验验证脚本编排和断言，不代替真实 HTTP 验收；运行报告中的每个失败均保留阻断。
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
index 013e3b62b..11ca11af5 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
@@ -19,8 +19,13 @@ test('return receipt acceptance covers both lookup paths, partial/final receipt
   assert.match(source, /PDA_RECEIPTS = '\/api\/pda\/v1\/last-leg\/return-receipts'/)
   assert.match(source, /\$\{PDA_RECEIPTS\}\/start/)
   assert.match(source, /\$\{PDA_RECEIPTS\}\/sku-candidates/)
-  assert.match(source, /PDA首次分批签收2件/)
-  assert.match(source, /PDA按SKU完成剩余3件签收/)
+  assert.match(source, /PDA首次单SKU签收甲3件/)
+  assert.match(source, /PDA按单SKU完成乙2件签收/)
+  assert.match(source, /palletCode: cartonA/)
+  assert.match(source, /最后一批缺少打托照片拒绝且库存不变/)
+  assert.match(source, /photos\/files/)
+  assert.match(source, /requestOverseasMultipart\('POST',[^\n]+photoForm, picker\.token\)/)
+  assert.doesNotMatch(source, /photoForm, \{\}, picker\.token/)
   assert.match(source, /不存在SKU不是业务错误/)
   assert.match(source, /已完成退货单不再进入待签收流程/)
 })
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs
index 649cec453..5ff371f88 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt.mjs
@@ -92,6 +92,32 @@ function itemMap(items) {
   return new Map((Array.isArray(items) ? items : []).map((item) => [item.skuCode, item]))
 }
 
+export async function approveReturnFixture(context, merchantToken, created) {
+  const expectedCustomer = id(context.context?.merchantQualificationFixture?.tenantId)
+  const order = created?.order
+  if (!expectedCustomer || !nonBlank(id(order?.returnNo))
+      || order.status !== 'PENDING_REVIEW') throw new Error('退货审核前置的客户、单号或状态不符')
+  // Summary deliberately omits customerId. Verify ownership via the merchant-scoped detail API.
+  const owned = await overseas(context, merchantToken, 'GET', '客户核对本轮待审核退货单',
+    `${RETURN_ORDERS}/${encodeURIComponent(order.returnNo)}`)
+  if (!success(owned.response) || owned.data?.order?.returnNo !== order.returnNo
+      || owned.data?.order?.status !== 'PENDING_REVIEW') throw new Error('客户不可读取当前待审核退货单')
+  const path = `/api/platform/v1/last-leg/return-orders/${encodeURIComponent(order.returnNo)}/review`
+  const response = await context.requestOverseas('POST', path,
+    { decision: 'APPROVE', remark: `${context.marker} 退货验收审核` }, { 'X-Customer-Id': expectedCustomer })
+  add(context, '平台审核本轮退货预报', response, success(response))
+  if (!success(response)) throw new Error(`退货审核失败：${trace(response)}`)
+  const detail = await overseas(context, merchantToken, 'GET', '客户回查退货审核状态',
+    `${RETURN_ORDERS}/${encodeURIComponent(order.returnNo)}`)
+  const verified = success(detail.response) && detail.data?.order?.returnNo === order.returnNo
+    && detail.data?.order?.status === 'PENDING_RECEIPT'
+    && Number(detail.data?.order?.receivedQuantity) === 0
+  context.assert(MODULE, '审核后同一客户同一退货单进入待签收且尚未入库', detail.response, verified,
+    trace(detail.response), OPTIONS)
+  if (!verified) throw new Error('退货审核回查未收敛，停止签收链路')
+  return detail.data
+}
+
 export async function run(context) {
   context.createdResources.phase4OverseasReturnReceipt = {
     marker: context.marker, returnNo: null, receiptNos: [], receiptBatchNos: [], cartonMarks: [],
@@ -126,12 +152,14 @@ export async function run(context) {
     const created = await overseas(context, merchantToken, 'POST', '客户创建双SKU退货预报', RETURN_ORDERS, createBody)
     const returnNo = id(created.data?.order?.returnNo)
     context.assert(MODULE, '退货预报初始数量和状态正确', created.response,
-      nonBlank(returnNo) && created.data?.order?.status === 'PENDING_RECEIPT'
+      nonBlank(returnNo) && created.data?.order?.status === 'PENDING_REVIEW'
         && Number(created.data?.order?.expectedQuantity) === 5
         && Number(created.data?.order?.receivedQuantity) === 0
         && itemMap(created.data?.items).size === 2,
       `returnNo=${returnNo || 'missing'}`, OPTIONS)
-    if (!returnNo) return
+    if (!success(created.response) || !returnNo || created.data?.order?.status !== 'PENDING_REVIEW') {
+      throw new Error('退货预报创建前置失败，停止后续签收')
+    }
     context.createdResources.phase4OverseasReturnReceipt.returnNo = returnNo
 
     async function snapshot() {
@@ -164,6 +192,8 @@ export async function run(context) {
     await reject('退货预报同键异载荷返回冲突', conflict, () => context.requestOverseas('POST', RETURN_ORDERS,
       { ...createBody, remark: `${context.marker}-CHANGED` }, {}, merchantToken))
 
+    await approveReturnFixture(context, merchantToken, created.data)
+
     for (const [name, items] of [
       ['空SKU明细', []],
       ['零预报数量', [{ skuCode: skuA, expectedQuantity: 0 }]],
@@ -201,15 +231,20 @@ export async function run(context) {
         && Number(candidate.skuExpectedQuantity) === 2 && Number(candidate.skuReceivedQuantity) === 0),
       trace(skuCandidates.response), OPTIONS)
 
-    const cartonA = `RC-${suffix}-A`.slice(0, 128)
+    const palletA = await overseas(context, picker.token, 'POST', 'PDA生成本轮SKU甲签收托盘', `${PDA_RECEIPTS}/pallets`, { returnNo, skuCode: skuA })
+    const palletB = await overseas(context, picker.token, 'POST', 'PDA生成本轮SKU乙签收托盘', `${PDA_RECEIPTS}/pallets`, { returnNo, skuCode: skuB })
+    if (!success(palletA.response) || !nonBlank(palletA.data?.palletCode)
+        || !success(palletB.response) || !nonBlank(palletB.data?.palletCode)) throw new Error('签收托盘准备失败')
+    const cartonA = palletA.data.palletCode
     const firstBody = {
-      returnNo, trackingNo: `TRACK-${suffix}`, startedBy: 'RETURN_NO', cartonMark: cartonA,
-      items: [{ skuCode: skuA, receivedQuantity: 2 }], idempotencyKey: key(context, 'RECEIPT-1'),
+      returnNo, trackingNo: `TRACK-${suffix}`, startedBy: 'RETURN_NO', palletCode: cartonA,
+      items: [{ skuCode: skuA, receivedQuantity: 3 }], idempotencyKey: key(context, 'RECEIPT-1'),
     }
-    const first = await overseas(context, picker.token, 'POST', 'PDA首次分批签收2件', `${PDA_RECEIPTS}/confirm`, firstBody)
+    const first = await overseas(context, picker.token, 'POST', 'PDA首次单SKU签收甲3件', `${PDA_RECEIPTS}/confirm`, firstBody)
+    if (!success(first.response)) throw new Error('首次签收失败，停止后续库存场景')
     context.assert(MODULE, '首次签收形成唯一箱和仓储计费批次', first.response,
       first.data?.orderStatus === 'PARTIALLY_RECEIVED' && first.data?.fullyMatched === false
-        && Number(first.data?.receivedQuantity) === 2 && first.data?.cartonMark === cartonA
+        && Number(first.data?.receivedQuantity) === 3 && first.data?.palletCode === cartonA
         && nonBlank(first.data?.receiptNo) && nonBlank(first.data?.receiptBatchNo),
       `receiptNo=${id(first.data?.receiptNo) || 'missing'}, billingBatch=${id(first.data?.receiptBatchNo) || 'missing'}`, OPTIONS)
     const firstReceiptNo = id(first.data?.receiptNo)
@@ -219,14 +254,14 @@ export async function run(context) {
     context.assert(MODULE, '签收重放不重复创建签收单、箱或计费批次', firstReplay.response,
       id(firstReplay.data?.receiptNo) === firstReceiptNo
         && id(firstReplay.data?.receiptBatchNo) === firstBatchNo
-        && id(firstReplay.data?.cartonMark) === cartonA,
+        && id(firstReplay.data?.palletCode) === cartonA,
       trace(firstReplay.response), OPTIONS)
     await reject('签收同键异载荷返回冲突', conflict, () => context.requestOverseas('POST', `${PDA_RECEIPTS}/confirm`, {
       ...firstBody, trackingNo: `TRACK-${suffix}-CHANGED`,
     }, {}, picker.token))
 
     await reject('超收被拒绝且不得生成费用批次', conflict, () => context.requestOverseas('POST', `${PDA_RECEIPTS}/confirm`, {
-      returnNo, startedBy: 'SKU', items: [{ skuCode: skuA, receivedQuantity: 2 }],
+      returnNo, startedBy: 'SKU', palletCode: cartonA, items: [{ skuCode: skuA, receivedQuantity: 2 }],
       idempotencyKey: key(context, 'OVER-RECEIPT'),
     }, {}, picker.token))
 
@@ -249,26 +284,34 @@ export async function run(context) {
       `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}`)
     context.assert(MODULE, '超收失败后订单、签收和费用批次数量均未变化', afterPartial.response,
       afterPartial.data?.order?.status === 'PARTIALLY_RECEIVED'
-        && Number(afterPartial.data?.order?.receivedQuantity) === 2
+        && Number(afterPartial.data?.order?.receivedQuantity) === 3
         && afterPartial.data?.receipts?.length === 1
         && id(afterPartial.data.receipts[0]?.receiptBatchNo) === firstBatchNo,
       `receipts=${afterPartial.data?.receipts?.length ?? 'missing'}`, OPTIONS)
 
     const secondBody = {
-      returnNo, startedBy: 'SKU',
-      items: [{ skuCode: skuA, receivedQuantity: 1 }, { skuCode: skuB, receivedQuantity: 2 }],
+      returnNo, startedBy: 'SKU', palletCode: palletB.data.palletCode,
+      items: [{ skuCode: skuB, receivedQuantity: 2 }],
       idempotencyKey: key(context, 'RECEIPT-2'),
     }
-    const second = await overseas(context, picker.token, 'POST', 'PDA按SKU完成剩余3件签收', `${PDA_RECEIPTS}/confirm`, secondBody)
+    await reject('最后一批缺少打托照片拒绝且库存不变', conflict, () => context.requestOverseas('POST', `${PDA_RECEIPTS}/confirm`, secondBody, {}, picker.token))
+    const photoForm = new FormData()
+    // Synthetic HTTP fixture, not a photograph of real warehouse activity.
+    photoForm.append('file', new Blob([Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aWQAAAABJRU5ErkJggg==', 'base64')], { type: 'image/png' }), 'return-receipt-test.png')
+    const photo = await context.requestOverseasMultipart('POST', `${PDA_RECEIPTS}/${encodeURIComponent(returnNo)}/photos/files`, photoForm, picker.token)
+    add(context, '上传本轮合成打托测试照片', photo, success(photo))
+    if (!success(photo) || !photo.body?.data?.fileId) throw new Error('打托照片上传失败')
+    const second = await overseas(context, picker.token, 'POST', 'PDA按单SKU完成乙2件签收', `${PDA_RECEIPTS}/confirm`, secondBody)
+    if (!success(second.response)) throw new Error('最终签收失败，停止合箱和换标后续')
     context.assert(MODULE, '最终签收自动核平并生成第二个费用批次', second.response,
       second.data?.orderStatus === 'COMPLETED' && second.data?.fullyMatched === true
-        && Number(second.data?.receivedQuantity) === 5 && nonBlank(second.data?.cartonMark)
+        && Number(second.data?.receivedQuantity) === 5 && second.data?.palletCode === palletB.data.palletCode
         && nonBlank(second.data?.receiptNo) && nonBlank(second.data?.receiptBatchNo)
         && id(second.data?.receiptBatchNo) !== firstBatchNo,
       `billingBatch=${id(second.data?.receiptBatchNo) || 'missing'}`, OPTIONS)
     const secondReceiptNo = id(second.data?.receiptNo)
     const secondBatchNo = id(second.data?.receiptBatchNo)
-    const cartonB = id(second.data?.cartonMark)
+    const cartonB = id(second.data?.palletCode)
     context.createdResources.phase4OverseasReturnReceipt.receiptNos.push(firstReceiptNo, secondReceiptNo)
     context.createdResources.phase4OverseasReturnReceipt.receiptBatchNos.push(firstBatchNo, secondBatchNo)
     context.createdResources.phase4OverseasReturnReceipt.cartonMarks.push(cartonA, cartonB)
@@ -323,8 +366,8 @@ export async function run(context) {
         && Number(summaries.get(skuB)?.totalQuantity) === 2,
       `skuA=${summaries.get(skuA)?.totalQuantity ?? 'missing'}, skuB=${summaries.get(skuB)?.totalQuantity ?? 'missing'}`, OPTIONS)
 
-    for (const [index, expected] of [{ cartonMark: cartonA, batchNo: firstBatchNo, quantity: 2 },
-      { cartonMark: cartonB, batchNo: secondBatchNo, quantity: 3 }].entries()) {
+    for (const [index, expected] of [{ cartonMark: cartonA, batchNo: firstBatchNo, quantity: 3 },
+      { cartonMark: cartonB, batchNo: secondBatchNo, quantity: 2 }].entries()) {
       const carton = await overseas(context, context.overseasToken, 'GET', `平台回查第${index + 1}个退货箱明细`,
         `/api/platform/v1/last-leg/return-inventory/cartons/${encodeURIComponent(expected.cartonMark)}`)
       context.assert(MODULE, `第${index + 1}个退货箱来源费用批次和数量正确`, carton.response,
@@ -364,7 +407,7 @@ export async function run(context) {
           && nonBlank(merged.data?.label?.printableHtml),
         `cartonMark=${merged.data?.cartonMark || 'missing'}`, OPTIONS)
       const consumedBatches = []
-      for (const [mark, batch, before] of [[cartonA, firstBatchNo, 2], [cartonB, secondBatchNo, 3]]) {
+      for (const [mark, batch, before] of [[cartonA, firstBatchNo, 3], [cartonB, secondBatchNo, 2]]) {
         const source = await overseas(context, merchantToken, 'GET', '合箱后回查来源箱实际扣减',
           `${RETURN_INVENTORY}/cartons/${encodeURIComponent(mark)}`)
         if (success(source.response) && Number(source.data?.totalQuantity) < before) consumedBatches.push(batch)
diff --git a/scripts/admin-test-env-modules/return-boundary-scenarios.mjs b/scripts/admin-test-env-modules/return-boundary-scenarios.mjs
index 8b935b53f..2a09c6e46 100644
--- a/scripts/admin-test-env-modules/return-boundary-scenarios.mjs
+++ b/scripts/admin-test-env-modules/return-boundary-scenarios.mjs
@@ -53,6 +53,7 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
   const key = name => `${prefix}-${name}-${++sequence}`
   const extraPickers = []
   let foreignPicker
+  const customerByToken = new Map([[merchantToken, String(context.context.merchantQualificationFixture.tenantId)]])
   let failures = 0
   const resources = context.createdResources.returnBoundaryScenarios = { returnNos: [], cartonMarks: [], cases: [], concurrencyRounds: 3 }
   function check(name, response, passed, evidence = '') {
@@ -77,19 +78,34 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
     resources.returnNos.push(data.order.returnNo)
     check('新退货单及退货主单采用独立完整编号', null,
       /^RT-[0-9A-Z]{25}$/.test(data.order.returnNo) && /^RETU-[0-9A-Z]{25}$/.test(data.order.lastlegOrderNo))
-    return { returnNo: data.order.returnNo, sku, skus: items.map(item => item.skuCode), quantity, token, warehouseId }
+    const customerId = customerByToken.get(token)
+    if (!customerId || data.order.status !== 'PENDING_REVIEW') throw new Error('边界退货客户或审核初态不符')
+    const reviewed = await context.requestOverseas('POST', `/api/platform/v1/last-leg/return-orders/${data.order.returnNo}/review`,
+      { decision: 'APPROVE', remark: context.marker }, { 'X-Customer-Id': customerId })
+    check('边界退货单审核通过进入待签收', reviewed, ok(reviewed) && reviewed.body.data?.order?.status === 'PENDING_RECEIPT')
+    if (!ok(reviewed) || reviewed.body.data?.order?.status !== 'PENDING_RECEIPT') throw new Error('边界退货审核失败')
+    const operator = String(warehouseId) === String(warehouse.id) ? picker : foreignPicker
+    if (!operator?.token) throw new Error('缺少本仓签收操作员')
+    const pallet = await good(operator.token, 'POST', '准备边界退货实收托盘', `${RECEIPTS}/pallets`, { returnNo: data.order.returnNo, skuCode: sku })
+    if (!pallet.palletCode) throw new Error('退货托盘码缺失')
+    const form = new FormData()
+    form.append('file', new Blob([Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aWQAAAABJRU5ErkJggg==', 'base64')], { type: 'image/png' }), 'synthetic-return-boundary.png')
+    const photo = await context.requestOverseasMultipart('POST', `${RECEIPTS}/${data.order.returnNo}/photos/files`, form, operator.token)
+    check('边界签收准备合成打托照片', photo, ok(photo) && Boolean(photo.body.data?.fileId))
+    if (!ok(photo) || !photo.body.data?.fileId) throw new Error('边界照片上传失败')
+    return { returnNo: data.order.returnNo, sku, skus: items.map(item => item.skuCode), quantity, token, warehouseId, palletCode: pallet.palletCode }
   }
   function receiptBody(order, quantity = order.quantity, idempotencyKey = key('RECEIPT')) {
-    return { returnNo: order.returnNo, startedBy: 'RETURN_NO', items: [{ skuCode: order.sku, receivedQuantity: quantity }], idempotencyKey }
+    return { returnNo: order.returnNo, startedBy: 'RETURN_NO', palletCode: order.palletCode, items: [{ skuCode: order.sku, receivedQuantity: quantity }], idempotencyKey }
   }
   async function receive(order, operator = picker) {
     const data = await good(operator.token, 'POST', '准备边界场景实收库存', `${RECEIPTS}/confirm`, receiptBody(order))
-    check('签收单批次及自动箱唛采用独立完整编号', null,
+    check('签收单批次采用独立完整编号且绑定本轮托盘', null,
       /^RR-[0-9A-Z]{25}$/.test(data.receiptNo) && /^RB-[0-9A-Z]{25}$/.test(data.receiptBatchNo)
-        && /^RC-[0-9A-Z]{25}$/.test(data.cartonMark))
-    order.cartonMark = data.cartonMark
+        && data.palletCode === order.palletCode)
+    order.cartonMark = data.palletCode
     order.batch = data.receiptBatchNo
-    resources.cartonMarks.push(data.cartonMark)
+    resources.cartonMarks.push(data.palletCode)
     return data
   }
   function mergeBody(orders, sku, quantity, idempotencyKey = key('MERGE')) {
@@ -140,6 +156,7 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
     check('第二隔离客户登录取得海外令牌', loginB, ok(loginB) && Boolean(loginB.body?.data?.overseasAccessToken))
     if (!ok(loginB) || !loginB.body?.data?.overseasAccessToken) return
     const tokenB = loginB.body.data.overseasAccessToken
+    customerByToken.set(tokenB, String(fixtureB.tenantId))
     const warehouseResponse = await context.request('GET', '/api/platform/v1/warehouse-admin?tenantId=0&page=1&size=200&capabilityCode=RECEIVING&warehouseType=OVERSEAS&status=ACTIVE')
     const otherWarehouse = rows(warehouseResponse?.body?.data).find(row => String(row.id) !== String(warehouse.id))
     check('跨仓场景具备第二个真实有效海外仓', warehouseResponse, ok(warehouseResponse) && Boolean(otherWarehouse))
@@ -205,7 +222,7 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
       const retry = await request(picker.token, 'POST', `${RECEIPTS}/confirm`, body)
       const accepted = sameKeyResponses.find(ok)?.body.data
       check('模拟成功响应丢失后原键重试复用原签收', retry, ok(retry) && accepted
-        && ['receiptNo', 'receiptBatchNo', 'cartonMark'].every(field => retry.body.data[field] === accepted[field]))
+        && ['receiptNo', 'receiptBatchNo', 'palletCode'].every(field => retry.body.data[field] === accepted[field]))
       check('重试后签收和库存不重复', retry, JSON.stringify(stableState(beforeRetry)) === JSON.stringify(stableState(await snapshot([replayOrder]))))
       }
     })
@@ -270,14 +287,18 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
       for (const [name, secondSku, quantity] of [['后项超收', skuB, 3], ['后项未预报', `${prefix}-ATOMIC-UNKNOWN`, 1]]) {
         await unchanged(`混合签收${name}必须整笔失败`, [order], () => request(picker.token, 'POST', `${RECEIPTS}/confirm`, makeReceipt(secondSku, quantity)), [409])
       }
-      await good(picker.token, 'POST', '混合明细正常签收准备合箱', `${RECEIPTS}/confirm`, {
-        ...receiptBody(order), items: [skuA, skuB].map(skuCode => ({ skuCode, receivedQuantity: 2 })) })
+      await unchanged('两个合法SKU同批签收仍整笔拒绝', [order], () => request(picker.token, 'POST', `${RECEIPTS}/confirm`, {
+        ...receiptBody(order), items: [skuA, skuB].map(skuCode => ({ skuCode, receivedQuantity: 2 })) }), [409])
+      await good(picker.token, 'POST', '甲SKU独立签收准备合箱', `${RECEIPTS}/confirm`, receiptBody(order))
+      const skuBPallet = await good(picker.token, 'POST', '乙SKU独立托盘', `${RECEIPTS}/pallets`, { returnNo: order.returnNo, skuCode: skuB })
+      await good(picker.token, 'POST', '乙SKU独立签收准备合箱', `${RECEIPTS}/confirm`, {
+        ...receiptBody(order), palletCode: skuBPallet.palletCode, items: [{ skuCode: skuB, receivedQuantity: 2 }] })
       for (const [name, secondSku, quantity] of [['后项超库存', skuB, 3], ['后项不存在', `${prefix}-ATOMIC-UNKNOWN`, 1]]) {
         await unchanged(`混合合箱${name}必须整笔回滚`, [order], () => request(picker.token, 'POST', MERGE, {
           ...mergeBody([order], skuA, 1), items: [{ skuCode: skuA, quantity: 1 }, { skuCode: secondSku, quantity }] }), [409])
       }
       const [state] = await snapshot([order])
-      check('混合失败后两SKU均保持两件且仅一个来源箱', null, Number(state.cartons.total) === 1
+      check('混合失败后两SKU均保持两件且各自一个来源箱', null, Number(state.cartons.total) === 2
         && [state.summary, ...state.additionalSummaries].every(page => rows(page).length === 1 && Number(rows(page)[0].availableQuantity) === 2))
     })
 
@@ -368,7 +389,8 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
         check, name: '签收重放不重复产生流水', expected: result => ok(result) && result.body.data?.receiptNo === signed.receiptNo })
       await verifyNoMutation({ snapshot: withLedger, action: () => request(picker.token, 'POST', `${RECEIPTS}/confirm`, receiptBody(order, 2)),
         check, name: '超收失败不留下流水', expected: result => rejected(result, [409]) })
-      const final = await good(picker.token, 'POST', '流水场景第二批实收一件', `${RECEIPTS}/confirm`, receiptBody(order, 1))
+      const nextPallet = await good(picker.token, 'POST', '流水场景第二批托盘', `${RECEIPTS}/pallets`, { returnNo: order.returnNo, skuCode: order.sku })
+      const final = await good(picker.token, 'POST', '流水场景第二批实收一件', `${RECEIPTS}/confirm`, { ...receiptBody(order, 1), palletCode: nextPallet.palletCode })
       const data = await ledger()
       check('两批签收流水业务引用唯一且分别两件一件', null, exactReceiptLedger(data,
         [entry, { ...entry, referenceNo: final.receiptNo, totalDelta: 1, availableDelta: 1 }]) && signed.receiptNo !== final.receiptNo)
@@ -392,7 +414,7 @@ export async function runReturnBoundaries(context, { merchantToken, warehouse, p
         && remaining.candidates[0].returnNo === b.returnNo && Number(remaining.candidates[0].skuExpectedQuantity) === 2
         && Number(remaining.candidates[0].skuReceivedQuantity) === 0)
       for (const [name, patch] of [
-        ['已存在箱号', { cartonMark: a.cartonMark }],
+        ['已存在箱号', { palletCode: a.cartonMark }],
         ['缺少幂等键', { idempotencyKey: '' }],
         ['超长快递单号', { trackingNo: 'X'.repeat(129) }],
       ]) await unchanged(`拒绝${name}`, [a, b], () => request(picker.token, 'POST', `${RECEIPTS}/confirm`, { ...receiptBody(b, 1), ...patch }), name === '已存在箱号' ? [409] : [400, 422])
diff --git a/scripts/admin-test-env-modules/return-review-contract.test.mjs b/scripts/admin-test-env-modules/return-review-contract.test.mjs
new file mode 100644
index 000000000..8076f8576
--- /dev/null
+++ b/scripts/admin-test-env-modules/return-review-contract.test.mjs
@@ -0,0 +1,41 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { approveReturnFixture } from './phase4-overseas-return-receipt.mjs'
+
+function fixture({ failedReview = false, wrongOwner = false, stale = false } = {}) {
+  let status = 'PENDING_REVIEW'
+  const calls = []
+  const context = { marker: 'FIXTURE', context: { merchantQualificationFixture: { tenantId: '123' } },
+    addStep() {}, assert() {},
+    async requestOverseas(method, path, body, headers, token) {
+      calls.push({ method, path, body, headers, token })
+      if (method === 'POST') {
+        assert.equal(headers['X-Customer-Id'], '123')
+        assert.equal(body.decision, 'APPROVE')
+        if (!stale) status = 'PENDING_RECEIPT'
+      } else assert.equal(token, 'merchant-session')
+      return { http: 200, requestId: 'request', traceId: 'trace', body: {
+        code: wrongOwner ? 'A0404' : failedReview && method === 'POST' ? 'A0403' : '200',
+        data: { order: { returnNo: 'RT-FIXTURE', status, receivedQuantity: '0' } },
+      } }
+    } }
+  return { context, calls, created: { order: { returnNo: 'RT-FIXTURE', status } } }
+}
+test('review requires merchant ownership then explicit platform customer then merchant readback', async () => {
+  const f = fixture()
+  const result = await approveReturnFixture(f.context, 'merchant-session', f.created)
+  assert.equal(result.order.status, 'PENDING_RECEIPT')
+  assert.deepEqual(f.calls.map(c => c.method), ['GET', 'POST', 'GET'])
+})
+test('cannot approve inaccessible customer order', async () => {
+  const f = fixture({ wrongOwner: true })
+  await assert.rejects(approveReturnFixture(f.context, 'merchant-session', f.created))
+  assert.equal(f.calls.some(c => c.method === 'POST'), false)
+})
+test('permission failure and stale review readback stop the receipt chain', async () => {
+  for (const config of [{ failedReview: true }, { stale: true }]) {
+    const f = fixture(config)
+    await assert.rejects(approveReturnFixture(f.context, 'merchant-session', f.created))
+    assert.equal(f.calls.filter(c => c.method === 'POST').length, 1)
+  }
+})

From 417cbc636357c2ea8b34fa058c32bc04710bce38 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 18:51:10 +0800
Subject: [PATCH 21/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/sql/README.md                          |  11 +-
 .../baiyue_file/V1__align_schema_baseline.sql |  55 ++++++
 .../V1__align_schema_baseline.sql             |  17 ++
 .../baiyue_iam/V1__align_schema_baseline.sql  |  35 ++++
 .../V2__align_schema_baseline.sql             |  66 +++++++
 scripts/README.md                             |   3 +
 scripts/admin-test-env-modules/README.md      |   4 +
 .../phase4-overseas-return-followups.mjs      |  98 +++++++++--
 ...-overseas-return-receipt-contract.test.mjs |  47 +++++
 ...eturn-boundary-scenarios-contract.test.mjs |  12 ++
 scripts/database-schema-contract.mjs          |   2 +-
 scripts/database-schema-diff.mjs              | 161 ++++++++++++++++++
 scripts/database-schema-diff.test.mjs         |  34 ++++
 scripts/db/test-return-relabel-checks.sql     |  18 ++
 14 files changed, 551 insertions(+), 12 deletions(-)
 create mode 100644 deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
 create mode 100644 deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
 create mode 100644 deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
 create mode 100644 deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
 create mode 100644 scripts/database-schema-diff.mjs
 create mode 100644 scripts/database-schema-diff.test.mjs
 create mode 100644 scripts/db/test-return-relabel-checks.sql

diff --git a/deploy/sql/README.md b/deploy/sql/README.md
index f82584788..5cc03e831 100644
--- a/deploy/sql/README.md
+++ b/deploy/sql/README.md
@@ -62,7 +62,16 @@
 
 ## 后续迁移工具（已开始实施）
 
-机制启用前，以上两份统一 SQL 仍是空库初始化入口；本节工具不会把当前可丢弃的开发/测试存量转换成迁移链。当前已登记一份生产尾程结构补齐迁移 `migrations/overseas/baiyue_lastleg/V1__align_lastleg_production_schema.sql`，由 `scripts/prod-database-schema-acceptance.mjs` 默认只读核对，只有显式确认参数才执行；它只新增字段、放宽生成后才确定字段的可空性并创建缺失表，不执行 DML。
+机制启用前，以上两份统一 SQL 仍是空库初始化入口；本节工具不会把当前可丢弃的开发/测试存量自动转换成迁移链。现有候选迁移包括：
+
+| 区域 / schema | 迁移 | 目的 |
+|---|---|---|
+| CN / `baiyue_iam` | `migrations/cn/baiyue_iam/V1__align_schema_baseline.sql` | 收敛客户编号、昵称和资质原文件名定义；收紧前检查存量数据 |
+| CN / `baiyue_firstleg` | `migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql` | 收敛一件代发托盘码非空定义；收紧前检查存量数据 |
+| CN / `baiyue_file` | `migrations/cn/baiyue_file/V1__align_schema_baseline.sql` | 补齐 PDA 发布表和固定渠道，收敛文件业务类型长度 |
+| OVERSEAS / `baiyue_lastleg` | `migrations/overseas/baiyue_lastleg/V1__align_lastleg_production_schema.sql`、`V2__align_schema_baseline.sql` | 补齐尾程字段并收敛字段定义和排序规则；收紧前检查存量数据 |
+
+上述新增候选当前只完成编写和离线检查，尚未在测试或生产执行。测试通过后必须复用同一份 SQL 和 manifest 晋级生产，不得重新生成或修改候选。`scripts/prod-database-schema-acceptance.mjs` 仍只负责历史尾程 V1 的专用只读核对/受控执行，不代表本批跨 schema 发布入口；本批按迁移 manifest 管理，实际执行须等待环境执行器接入或当前轮明确授权后的受控人工执行。
 
 迁移范围映射位于 `migration-scopes.json`，按区域、schema、所属服务和顺序登记。迁移文件位于 `migrations/{cn|overseas}/<schema>/`，一个文件只允许修改一个 schema。目录中的 `.gitkeep` 仅用于保留空目录，不是迁移文件。
 
diff --git a/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
new file mode 100644
index 000000000..f80f99e07
--- /dev/null
+++ b/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
@@ -0,0 +1,55 @@
+-- Region: CN
+-- Schema: baiyue_file
+-- Purpose: 补齐 PDA 发布表，并将文件业务类型长度收敛到当前空库基线。
+-- Preconditions: 连接必须指向 baiyue_file；既有 business_type 不超过 32 字符。
+-- Postconditions: PDA 发布表及固定渠道存在，file_object.business_type 为 varchar(32)。
+
+SET NAMES utf8mb4;
+
+SET @guard = IF(
+  EXISTS (SELECT 1 FROM file_object WHERE CHAR_LENGTH(business_type) > 32 LIMIT 1),
+  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''file_object.business_type exceeds 32 characters''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+ALTER TABLE file_object
+  MODIFY COLUMN business_type varchar(32) DEFAULT NULL COMMENT '关联业务类型';
+
+CREATE TABLE IF NOT EXISTS file_pda_release_channel (
+  app_code varchar(16) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  current_apk_id char(36) DEFAULT NULL,
+  current_wgt_id char(36) DEFAULT NULL,
+  PRIMARY KEY (app_code)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='国内/海外PDA当前发布指针';
+
+CREATE TABLE IF NOT EXISTS file_pda_release (
+  id char(36) NOT NULL,
+  app_code varchar(16) NOT NULL,
+  app_id varchar(64) NOT NULL,
+  package_type varchar(8) NOT NULL,
+  version_name varchar(32) NOT NULL,
+  version_code int unsigned NOT NULL,
+  min_app_version_code int unsigned NOT NULL,
+  mandatory tinyint(1) NOT NULL DEFAULT '0',
+  release_notes varchar(1000) NOT NULL DEFAULT '',
+  status varchar(16) NOT NULL DEFAULT 'DRAFT',
+  object_key varchar(128) NOT NULL,
+  sha256 char(64) NOT NULL,
+  size_bytes bigint unsigned NOT NULL,
+  created_by bigint unsigned NOT NULL,
+  created_at datetime(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  published_at datetime(3) DEFAULT NULL,
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_pda_release_version (app_code,package_type,version_name),
+  KEY idx_pda_release_created (app_code,created_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='PDA安装包与热更新发布历史';
+
+INSERT INTO file_pda_release_channel (app_code,app_id)
+SELECT 'domestic','__UNI__9BFFAF2'
+WHERE NOT EXISTS (SELECT 1 FROM file_pda_release_channel WHERE app_code = 'domestic');
+
+INSERT INTO file_pda_release_channel (app_code,app_id)
+SELECT 'overseas','__UNI__936D079'
+WHERE NOT EXISTS (SELECT 1 FROM file_pda_release_channel WHERE app_code = 'overseas');
diff --git a/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
new file mode 100644
index 000000000..f63d365d5
--- /dev/null
+++ b/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
@@ -0,0 +1,17 @@
+-- Region: CN
+-- Schema: baiyue_firstleg
+-- Purpose: 将一件代发作业托盘码可空性收敛到当前空库基线。
+-- Preconditions: 连接必须指向 baiyue_firstleg；fl_dropship_pallet.pallet_no 不存在 NULL。
+-- Postconditions: pallet_no 为 varchar(32) NOT NULL。
+
+SET NAMES utf8mb4;
+
+SET @guard = IF(
+  EXISTS (SELECT 1 FROM fl_dropship_pallet WHERE pallet_no IS NULL LIMIT 1),
+  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''fl_dropship_pallet.pallet_no contains NULL''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+ALTER TABLE fl_dropship_pallet
+  MODIFY COLUMN pallet_no varchar(32) NOT NULL COMMENT '现场扫描的系统DP托盘码';
diff --git a/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
new file mode 100644
index 000000000..eee539c55
--- /dev/null
+++ b/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
@@ -0,0 +1,35 @@
+-- Region: CN
+-- Schema: baiyue_iam
+-- Purpose: 将客户编号、昵称和资质原文件名定义收敛到当前空库基线。
+-- Preconditions: 连接必须指向 baiyue_iam；待收紧字段不存在 NULL，tenant_code 不超过 8 字符。
+-- Postconditions: 三个字段的类型和可空性与头程统一初始化 SQL 一致。
+
+SET NAMES utf8mb4;
+
+SET @guard = IF(
+  EXISTS (SELECT 1 FROM iam_tenant WHERE customer_nickname IS NULL LIMIT 1),
+  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant.customer_nickname contains NULL''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @guard = IF(
+  EXISTS (SELECT 1 FROM iam_tenant WHERE CHAR_LENGTH(tenant_code) > 8 LIMIT 1),
+  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant.tenant_code exceeds 8 characters''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @guard = IF(
+  EXISTS (SELECT 1 FROM iam_tenant_qualification WHERE original_file_name IS NULL LIMIT 1),
+  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant_qualification.original_file_name contains NULL''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+ALTER TABLE iam_tenant
+  MODIFY COLUMN tenant_code varchar(8) NOT NULL COMMENT '客户编号：企业客户固定五位数字，平台技术主体为PLATFORM',
+  MODIFY COLUMN customer_nickname varchar(32) NOT NULL COMMENT '客户昵称：创建时默认取公司名称中文拼音大写首字母，可修改';
+
+ALTER TABLE iam_tenant_qualification
+  MODIFY COLUMN original_file_name varchar(255) NOT NULL COMMENT '上传时原始文件名';
diff --git a/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql b/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
new file mode 100644
index 000000000..610f04578
--- /dev/null
+++ b/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
@@ -0,0 +1,66 @@
+-- Region: OVERSEAS
+-- Schema: baiyue_lastleg
+-- Purpose: 补齐测试与生产各自缺失的尾程字段，并将字段定义收敛到当前空库基线。
+-- Preconditions: 连接必须指向 baiyue_lastleg；待收紧字段不存在 NULL，review_decision 不超过 16 字符。
+-- Postconditions: 本文件涉及的字段集合、类型、默认值、可空性和测量照片表排序规则与海外统一初始化 SQL 一致。
+
+SET NAMES utf8mb4;
+
+-- 测试环境当前缺失、生产已存在的 PDA 废弃作业字段。
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_cargo_discard_item' AND column_name = 'actual_discard_packages'), 'ALTER TABLE ll_cargo_discard_item ADD COLUMN actual_discard_packages int NULL COMMENT ''PDA确认实际废弃箱数'' AFTER discard_packages', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_cargo_discard_item' AND column_name = 'pda_status'), 'ALTER TABLE ll_cargo_discard_item ADD COLUMN pda_status varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''PENDING'' COMMENT ''PDA处理状态：待处理PENDING、已完成COMPLETED'' AFTER actual_discard_packages', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_cargo_discard_item' AND column_name = 'pda_operator_id'), 'ALTER TABLE ll_cargo_discard_item ADD COLUMN pda_operator_id varchar(128) COLLATE utf8mb4_unicode_ci NULL COMMENT ''PDA操作人'' AFTER pda_status', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_cargo_discard_item' AND column_name = 'pda_completed_at'), 'ALTER TABLE ll_cargo_discard_item ADD COLUMN pda_completed_at datetime(3) NULL COMMENT ''PDA完成时间'' AFTER pda_operator_id', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 生产环境当前缺失、测试已存在的换标与退货字段。
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_relabel_pda_unit_fact' AND column_name = 'quantity'), 'ALTER TABLE ll_relabel_pda_unit_fact ADD COLUMN quantity int NOT NULL DEFAULT 1 COMMENT ''本次事实处理件数，箱级作业固定为1'' AFTER reason', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_return_inventory_carton' AND column_name = 'pallet_code'), 'ALTER TABLE ll_return_inventory_carton ADD COLUMN pallet_code varchar(128) COLLATE utf8mb4_unicode_ci NULL COMMENT ''签收时绑定的托盘码'' AFTER source_return_no', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_return_order' AND column_name = 'discrepancy_reason'), 'ALTER TABLE ll_return_order ADD COLUMN discrepancy_reason varchar(500) COLLATE utf8mb4_unicode_ci NULL COMMENT ''手动完结差异原因'' AFTER status', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_return_order' AND column_name = 'manually_completed_at'), 'ALTER TABLE ll_return_order ADD COLUMN manually_completed_at datetime(3) NULL COMMENT ''手动差异完结时间'' AFTER discrepancy_reason', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_return_receipt' AND column_name = 'pallet_code'), 'ALTER TABLE ll_return_receipt ADD COLUMN pallet_code varchar(128) COLLATE utf8mb4_unicode_ci NULL COMMENT ''本次签收绑定的托盘码'' AFTER carton_mark', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+-- 收紧测试库漂移字段前先阻断不满足目标定义的数据，不执行自动回填或清理。
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_delivery_order WHERE delivery_group_key IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_delivery_order.delivery_group_key contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_local_looseboard_order WHERE container_type IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_local_looseboard_order.container_type contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_us_truck_order WHERE container_type IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_us_truck_order.container_type contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_outbound_pda_pick WHERE inventory_position_id IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_outbound_pda_pick.inventory_position_id contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE new_sku_code IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_item.new_sku_code contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE source_warehouse_id IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_item.source_warehouse_id contains NULL''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_pda_task WHERE CHAR_LENGTH(review_decision) > 16 LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_pda_task.review_decision exceeds 16 characters''', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+ALTER TABLE ll_delivery_order
+  MODIFY COLUMN delivery_group_key varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '同一出库单内按目的FBA仓拆单的稳定分组键';
+ALTER TABLE ll_local_looseboard_order
+  MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ';
+ALTER TABLE ll_us_truck_order
+  MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ';
+ALTER TABLE ll_outbound_pda_pick
+  MODIFY COLUMN inventory_position_id bigint NOT NULL COMMENT '库存仓位ID';
+ALTER TABLE ll_relabel_item
+  MODIFY COLUMN new_sku_code varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标后SKU编码',
+  MODIFY COLUMN source_warehouse_id varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原海外中转仓ID';
+ALTER TABLE ll_relabel_pda_task
+  MODIFY COLUMN review_decision varchar(16) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最近复核结论：APPROVE或REWORK';
+
+SET @ddl = IF(
+  (SELECT table_collation FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = 'll_warehouse_transfer_measurement_photo') <> 'utf8mb4_unicode_ci',
+  'ALTER TABLE ll_warehouse_transfer_measurement_photo CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/scripts/README.md b/scripts/README.md
index 3a3a8258d..d7a7d7d60 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -1,5 +1,7 @@
 # 后端脚本管理与全量 HTTP 验收索引
 
+`db/test-return-relabel-checks.sql`：测试库退货转换标检查约束定向修复，显式目标 `baiyue_lastleg.ll_return_inventory_carton`。与 Lastleg 基线保持一致，允许正数量的 `RELABEL_PENDING`，保留可用/已出库正数量与已合箱零数量限制。一条原子 ALTER 同时替换两个既有 CHECK，不修改业务行、不删除数据、不关闭约束；重复执行得到相同约束，旧约束不存在则报错停止。凭据由外部测试数据库连接提供，执行前需测试库操作授权；末尾只读输出约束定义供回查。不是生产迁移入口，不能替代完整 HTTP 换标回归。
+
 `db/relabel-wait-status-incremental.sql`：存量换标主单状态修正，显式使用 `baiyue_lastleg`。由操作者选择已授权数据库连接执行，无内置凭据；只更新未生成入库单、仍为待分配的 `RELABEL_APPLICATION` 主单为待换标/待排车/待出库，不修改库存或删除单据。事务执行、可重复运行，执行后按换标号回查订单状态；无单独报告文件。
 
 `db/warehouse-transfer-outbound-incremental.sql`：固定指向 `baiyue_lastleg`，一次补齐仓储转运审核、提货、PDA 测量打托、现场照片、换标、FBA/私人仓目的地、入库计划、智能排车和派送所需表、租户字段及索引，并将换标新 SKU 和转运托盘生命周期字段修正为本地要求的可空结构。无内置凭据；表使用 `CREATE TABLE IF NOT EXISTS`，字段和索引通过 `information_schema` 独立判断，可重复执行，不删除或改写业务单据。完整成功时返回 `WAREHOUSE_TRANSFER_LATEST_SCHEMA_READY`；若历史数据存在同客户重复托盘号，则返回 `WAREHOUSE_TRANSFER_SCHEMA_APPLIED_WITH_INDEX_BLOCKER`，且 `inbound_pallet_unique_index` 为 `BLOCKED_BY_DUPLICATE_CUSTOMER_PALLET_NO`。其余结构仍正常补齐，脚本不会擅自修改历史托盘号。
@@ -127,6 +129,7 @@ Client 全量、Client 入库测量与计费、待审核订单和批量待分柜
 | 本地质量 | `frontend-full-regression.ps1` | 编排 Admin/Client 本地测试、类型检查及国内/海外 PDA Node 全量测试，不访问 Gateway |
 | 本地质量 | `database-comment-audit.ps1` | 离线扫描数据库中文注释，不连接数据库 |
 | Jenkins 只读数据库结构 | `database-schema-contract.mjs` | 只查询 `information_schema` 核对区域初始化 SQL 的表和字段；不执行 SQL、不造业务数据、不执行迁移 |
+| 环境间只读数据库结构 | `database-schema-diff.mjs` | 通过显式 `--left-env`、`--right-env` 双向比较两套 MySQL 的 schema、表和字段契约；默认忽略字段顺序，只查询 `information_schema`，差异时退出码为 1，不生成或执行修复 SQL |
 | 本地质量 | `local-db-full-acceptance.ps1` | 只允许本机 MySQL 的受控 SQL 验收；非 dry-run 会写本地测试库 |
 | 本地质量 | `mapper-scan-contract.mjs` | 离线检查 Mapper 注解与扫描入口，不启动 Spring、不连接数据库 |
 | 本地质量 | `java-quality-summary.mjs` | 聚合 Maven 拓扑、OpenAPI、JaCoCo 和 SpotBugs 已有报告，不启动服务 |
diff --git a/scripts/admin-test-env-modules/README.md b/scripts/admin-test-env-modules/README.md
index 34babb109..9d32effcc 100644
--- a/scripts/admin-test-env-modules/README.md
+++ b/scripts/admin-test-env-modules/README.md
@@ -16,10 +16,14 @@
 
 扩展离线检查：`node --test scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs scripts/admin-test-env-modules/merchant-qualification-fixture-contract.test.mjs scripts/script-documentation-contract.test.mjs`。这些校验验证脚本编排和断言，不代替真实 HTTP 验收；运行报告中的每个失败均保留阻断。
 
+边界扩展创建的每张退货单也必须先审核，并由绑定该仓的 PDA 经正式接口生成本轮退货实收托盘、上传合成打托测试图片；客户身份通过本轮登录会话映射，禁止用主客户替代第二客户。签收请求传 `palletCode`，成功响应核对同一托盘而非已移除的 `cartonMark` 字段；流水分两批时分别使用两个正式托盘。混合明细场景先验证两种 SKU 同批拒绝且不落账，再分别签收为两个来源库存箱以继续合箱回滚验证。三轮双请求并发范围保持不变。
+
 同一退货扩展还覆盖五组完整性检查：混合明细中前项合法、后项超量/不存在时签收与合箱整笔回滚；同一操作员同键并发合箱及后续重试只生成一个目标箱；不同客户及仓库使用同一 SKU 时的候选、列表和库存隔离；客户/平台/PDA/无登录身份不得进入未授权退货入口；两批签收流水逐行核对客户、仓库、SKU、签收业务号及增量，并在重放和超收失败后回查不变。流水由现有接口从签收明细重建，不代表独立持久审计账本，也不验证后续换标或出库。并发合箱固定三轮、每轮两个请求，其余造数和校验顺序执行。
 
 `phase4-overseas-return-followups.mjs` 是独立可选后续模块，只在显式 `--modules phase4-overseas-return-followups` 时依赖并运行退货前置，再关联换标单及执行退货出库；不计入退货专项通过结论。仅复用同次运行、同 marker 的退货资源，凭据只在内存中，finally 停用其独立临时 PDA。合同检查复用 `phase4-overseas-return-receipt-contract.test.mjs`；HTTP 必须有目标环境写入授权。
 
+退货转换标请求按当前契约传 `items[{skuCode, quantity}]`、`fileScope` 和真实 FBA 目的仓 ID/编码，返回 `PENDING_REVIEW` 与 `skuCodes`。分页查找启用的 SCK8，缺失则阻断；总箱标文件回查 `cartonTotalFileId`。独立退货出库候选使用查询参数 `warehouseId`。同模块的 `completeReturnRelabel` 在独立出库之后继续审核本轮换标申请、PDA 认领与数量完成、来源托盘解析、正式生成目标托盘、组托及原键重放、上传合成完工图片、提交完工、客户确认及原键重放，最终回查原退货单仍为签收完成且换标关联一致。它不执行其他客户库存操作；目标托盘是本轮换标业务资源，不是国内基础托盘。退货 SKU 换标客户确认后为 `COMPLETED`，还需另验该换标库存的后续出库；不能把此前未冻结库存独立出库视为换标后出库。
+
 退货专项复跑命令（在后端根目录执行，每次使用新的报告名；不要与其他环境混用）：
 
 ```powershell
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
index bf43e5537..3778f0f7b 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
@@ -102,22 +102,35 @@ export async function run(context) {
     const relabelCandidates = await overseas(context, merchantToken, 'GET', '客户查询本轮退货换标候选',
       `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}/relabel-candidates`)
     const relabelCandidate = (Array.isArray(relabelCandidates.data) ? relabelCandidates.data : [])
-      .find(row => nonBlank(row?.cartonMark) && row?.status === 'AVAILABLE')
+      .find(row => source.cartonMarks?.includes(row?.cartonMark) && row?.status === 'AVAILABLE')
     context.assert(MODULE, '退货换标候选来自本轮已签收可用箱', relabelCandidates.response,
       Boolean(relabelCandidate) && relabelCandidate.sourceReturnNo === returnNo,
       `cartonMark=${relabelCandidate?.cartonMark || 'missing'}`, OPTIONS)
     if (relabelCandidate) {
+      let destination
+      for (let page = 1; page <= 20; page += 1) {
+        const destinations = await context.request('GET', `/api/platform/v1/warehouse-admin?page=${page}&size=200&warehouseType=FBA&status=ACTIVE`)
+        if (!success(destinations)) throw new Error('读取FBA目的仓失败')
+        const data = destinations.body.data
+        destination = records(data).find(row => row.warehouseCode === 'SCK8' && row.status === 'ACTIVE')
+        if (destination || page * 200 >= Number(data.total)) break
+        if (!records(data).length) throw new Error('FBA目的仓分页不完整')
+      }
+      if (!destination?.id) throw new Error('完整分页未找到启用的SCK8目的仓，停止退货转换标')
+      const sku = relabelCandidate.items?.[0]?.skuCode
+      if (!sku) throw new Error('本轮候选缺少SKU')
       const relabelBody = {
-        cartonMarks: [relabelCandidate.cartonMark], idempotencyKey: key(context, 'RELABEL'),
-        contactName: '退货换标验收', contactPhone: '13800000008', deliveryMethod: 'TRUCK', remark: context.marker,
+        items: [{ skuCode: sku, quantity: 1 }], idempotencyKey: key(context, 'RELABEL'),
+        fileScope: 'CARTON_TOTAL', destinationFbaWarehouseId: id(destination.id),
+        destinationFbaWarehouseCode: destination.warehouseCode, cartonRemark: context.marker,
       }
       const relabel = await overseas(context, merchantToken, 'POST', '客户从退货箱创建换标单',
         `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}/relabel`, relabelBody)
       const relabelNo = id(relabel.data?.relabelNo)
-      context.assert(MODULE, '退货换标单绑定原退货单与选中箱', relabel.response,
+      context.assert(MODULE, '退货换标单绑定原退货单与选中SKU', relabel.response,
         nonBlank(relabelNo) && relabel.data?.returnNo === returnNo
-          && relabel.data?.status === 'PENDING_PROCESSING'
-          && relabel.data?.cartonMarks?.includes?.(relabelCandidate.cartonMark),
+          && relabel.data?.status === 'PENDING_REVIEW'
+          && relabel.data?.skuCodes?.includes?.(sku),
         `relabelNo=${relabelNo || 'missing'}`, OPTIONS)
       if (relabelNo) {
         const form = new FormData()
@@ -125,21 +138,21 @@ export async function run(context) {
           { type: 'application/pdf' }), `${suffix}-return-relabel.pdf`)
         const uploaded = await context.requestOverseasMultipart('POST',
           `/api/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files?scope=CARTON_TOTAL`,
-          form, {}, merchantToken)
+          form, merchantToken)
         add(context, '客户编辑退货换标总资料', uploaded, success(uploaded))
         const relabelDetail = await overseas(context, merchantToken, 'GET', '客户回查退货换标资料修改',
           `/api/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`)
         context.assert(MODULE, '退货换标详情持久化总资料且业务状态未漂移', relabelDetail.response,
           relabelDetail.data?.application?.relabelNo === relabelNo
-            && relabelDetail.data?.application?.status === 'PENDING_PROCESSING'
-            && nonBlank(relabelDetail.data?.application?.totalFileId), trace(relabelDetail.response), OPTIONS)
+            && relabelDetail.data?.application?.status === 'PENDING_REVIEW'
+            && nonBlank(relabelDetail.data?.application?.cartonTotalFileId), trace(relabelDetail.response), OPTIONS)
         context.createdResources.phase4OverseasReturnReceipt.relabelNo = relabelNo
       }
     }
 
     const outboundCandidates = await overseas(context, context.overseasToken, 'GET', '平台查询本轮退货出库候选',
       query('/api/platform/v1/last-leg/outbound-orders/return/candidates', {
-        customerId, overseasWarehouseId: warehouse.id,
+        customerId, warehouseId: warehouse.id,
       }))
     const outboundCandidate = (Array.isArray(outboundCandidates.data) ? outboundCandidates.data : [])
       .find(row => row?.returnNo === returnNo && nonBlank(row?.cartonMark)
@@ -185,7 +198,72 @@ export async function run(context) {
         context.createdResources.phase4OverseasReturnReceipt.returnOutboundNo = outboundNo
       }
     }
+    if (source.relabelNo) await completeReturnRelabel(context, merchantToken, picker.token, source.relabelNo, returnNo)
   } finally {
     await disablePicker(context, picker, 92)
   }
 }
+
+export async function completeReturnRelabel(context, merchantToken, pdaToken, relabelNo, returnNo) {
+  const platform = `/api/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`
+  const merchant = `/api/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`
+  const work = `/api/pda/v1/last-leg/relabel-tasks/${encodeURIComponent(relabelNo)}`
+  const pallets = '/api/pda/v1/last-leg/pallet-operations'
+  const command = async (token, method, name, path, body) => {
+    const result = await overseas(context, token, method, name, path, body)
+    if (!success(result.response)) throw new Error(`${name}: ${trace(result.response)}`)
+    return result.data
+  }
+  const require = (name, passed) => {
+    context.assert(MODULE, name, null, Boolean(passed), `relabelNo=${relabelNo}`, OPTIONS)
+    if (!passed) throw new Error(name)
+  }
+  const reviewed = await command(context.overseasToken, 'PUT', '审核本轮退货换标申请', `${platform}/status`,
+    { status: 'PENDING_PROCESSING', remark: context.marker })
+  require('换标审核后等待PDA作业', reviewed.application?.relabelNo === relabelNo && reviewed.application.status === 'PENDING_PROCESSING')
+  let task = await command(pdaToken, 'POST', 'PDA认领本轮退货换标', `${work}/claim`, { idempotencyKey: key(context, 'RETURN-CLAIM') })
+  require('本轮任务全部为退货SKU换标', task.relabelNo === relabelNo && task.items?.length > 0
+    && task.items.every(item => item.operationType === 'RETURN_BULK_SKU_LABEL'))
+  for (const item of task.items) {
+    task = await command(pdaToken, 'POST', 'PDA完成本轮退货SKU数量', `${work}/return-skus/complete`, {
+      itemId: item.itemId, quantity: Number(item.expectedPackages), expectedVersion: Number(task.version),
+      idempotencyKey: key(context, `RETURN-SKU-${item.itemId}`),
+    })
+  }
+  const sources = await command(pdaToken, 'POST', '读取本轮换标实际来源托盘', `${pallets}/relabel-sources`, { relabelNo })
+  require('退货换标具有明确来源托盘', Array.isArray(sources) && sources.length > 0)
+  for (const [index, source] of sources.entries()) {
+    const target = await command(pdaToken, 'POST', '生成本轮带目的仓换标托盘', `${pallets}/relabel-pallet-label`,
+      { relabelNo, idempotencyKey: key(context, `RETURN-PALLET-${index}`) })
+    const from = await command(pdaToken, 'POST', '回查来源托盘版本', `${pallets}/resolve`, { code: source.palletCode })
+    const to = await command(pdaToken, 'POST', '回查目标托盘版本', `${pallets}/resolve`, { code: target.palletCode })
+    require('组托仅使用本轮任务箱唛', source.cartonMarks?.length > 0
+      && source.cartonMarks.every(mark => task.items.some(item => item.cartonMark === mark)))
+    const body = { relabelNo, source: { palletCode: from.palletCode, expectedVersion: Number(from.palletVersion) },
+      target: { palletCode: to.palletCode, expectedVersion: Number(to.palletVersion) },
+      cartonMarks: source.cartonMarks, idempotencyKey: key(context, `RETURN-BIND-${index}`), reason: context.marker }
+    const bound = await command(pdaToken, 'POST', '退货换标按实际数量绑定目标托盘', `${pallets}/relabel-disassemble`, body)
+    const replay = await command(pdaToken, 'POST', '退货换标组托原键重放', `${pallets}/relabel-disassemble`, body)
+    require('换标组托重放不重复移动库存', bound.status === 'COMPLETED' && replay.replayed === true && id(bound.operationId) === id(replay.operationId))
+  }
+  task = await command(pdaToken, 'GET', '组托后回查换标任务版本', work)
+  const form = new FormData()
+  form.append('file', new Blob([Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aWQAAAABJRU5ErkJggg==', 'base64')], { type: 'image/png' }), 'synthetic-return-relabel.png')
+  const photo = await context.requestOverseasMultipart('POST', `${work}/photos/files`, form, pdaToken)
+  add(context, '上传合成换标完工照片', photo, success(photo))
+  if (!success(photo) || !photo.body.data?.fileId) throw new Error('换标完工照片失败')
+  task = await command(pdaToken, 'POST', 'PDA提交退货换标完工', `${work}/complete`, {
+    photoFileIds: [id(photo.body.data.fileId)], expectedVersion: Number(task.version),
+    idempotencyKey: key(context, 'RETURN-COMPLETE'), remark: context.marker,
+  })
+  require('换标完工等待客户确认', task.applicationStatus === 'CUSTOMER_CONFIRM_PENDING')
+  const body = { idempotencyKey: key(context, 'RETURN-CONFIRM'), remark: context.marker }
+  const confirmed = await command(merchantToken, 'POST', '客户确认本轮退货换标完成', `${merchant}/confirm-completion`, body)
+  const replay = await command(merchantToken, 'POST', '客户确认换标原键重放', `${merchant}/confirm-completion`, body)
+  require('退货SKU换标客户确认完成且不重复建单', confirmed.application?.status === 'COMPLETED'
+    && replay.application?.relabelNo === relabelNo && replay.application?.status === 'COMPLETED')
+  const order = await command(merchantToken, 'GET', '回查原退货单换标状态', `${RETURN_ORDERS}/${encodeURIComponent(returnNo)}`)
+  require('原退货单保持签收完成且关联同一已完成换标', order.order?.status === 'COMPLETED'
+    && order.order?.relabelNo === relabelNo && order.order?.relabelStatus === 'COMPLETED')
+  context.createdResources.phase4OverseasReturnReceipt.relabelCompleted = true
+}
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
index 11ca11af5..cef04d8e8 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
@@ -3,10 +3,45 @@ import assert from 'node:assert/strict'
 import { readFile } from 'node:fs/promises'
 import { validationFailure, inventorySnapshot } from './phase4-overseas-return-receipt.mjs'
 import { normalizeModuleOrder } from '../admin-test-env-acceptance.mjs'
+import { completeReturnRelabel } from './phase4-overseas-return-followups.mjs'
 
 const moduleUrl = new URL('./phase4-overseas-return-receipt.mjs', import.meta.url)
 const acceptanceUrl = new URL('../admin-test-env-acceptance.mjs', import.meta.url)
 
+test('return relabel lifecycle requires review, quantities, binding, photo and customer confirmation', async () => {
+  const calls = []
+  const task = { relabelNo: 'RL-1', version: 1, items: [{ itemId: '1', cartonMark: 'BOX', operationType: 'RETURN_BULK_SKU_LABEL', expectedPackages: 1 }] }
+  const context = { marker: 'fixture', overseasToken: 'admin', createdResources: { phase4OverseasReturnReceipt: {} },
+    addStep() {}, assert(_m, name, _r, passed) { assert.ok(passed, name) },
+    async requestOverseas(method, path, body, _headers, token) {
+      calls.push({ method, path, body, token })
+      let data = task
+      if (path.endsWith('/status')) data = { application: { relabelNo: 'RL-1', status: 'PENDING_PROCESSING' } }
+      if (path.endsWith('/relabel-sources')) data = [{ palletCode: 'OLD', cartonMarks: ['BOX'] }]
+      if (path.endsWith('/relabel-pallet-label')) data = { palletCode: 'NEW' }
+      if (path.endsWith('/resolve')) data = { palletCode: body.code, palletVersion: 1 }
+      if (path.endsWith('/relabel-disassemble')) data = { status: 'COMPLETED', operationId: '9', replayed: true }
+      if (path.endsWith('/RL-1/complete')) data = { applicationStatus: 'CUSTOMER_CONFIRM_PENDING' }
+      if (path.endsWith('/confirm-completion')) data = { application: { relabelNo: 'RL-1', status: 'COMPLETED' } }
+      if (path.endsWith('/return-orders/RT-1')) data = { order: { status: 'COMPLETED', relabelNo: 'RL-1', relabelStatus: 'COMPLETED' } }
+      return { http: 200, body: { code: '200', data } }
+    },
+    async requestOverseasMultipart(method, path, form, token) {
+      assert.equal(token, 'pda'); assert.ok(form instanceof FormData)
+      calls.push({ method, path })
+      return { http: 200, body: { code: '200', data: { fileId: '7' } } }
+    } }
+  await completeReturnRelabel(context, 'merchant', 'pda', 'RL-1', 'RT-1')
+  assert.equal(context.createdResources.phase4OverseasReturnReceipt.relabelCompleted, true)
+  const index = suffix => calls.findIndex(c => c.path.endsWith(suffix))
+  assert.ok(index('/status') < index('/claim'))
+  assert.ok(index('/return-skus/complete') < index('/relabel-disassemble'))
+  assert.ok(index('/relabel-disassemble') < index('/photos/files'))
+  assert.ok(index('/photos/files') < index('/RL-1/complete'))
+  assert.ok(index('/RL-1/complete') < index('/confirm-completion'))
+  assert.equal(calls.find(c => c.path.endsWith('/confirm-completion')).token, 'merchant')
+})
+
 test('full acceptance registers return receipt as a configured overseas module with an isolated merchant fixture', async () => {
   const source = await readFile(acceptanceUrl, 'utf8')
   assert.match(source, /CONFIGURED_MODULES[^\n]+phase4-overseas-return-receipt/)
@@ -62,6 +97,18 @@ test('receipt scope stops before relabel and outbound; followups are explicit an
   assert.ok(!normalizeModuleOrder(['phase4-overseas-return-receipt']).includes('phase4-overseas-return-followups'))
 })
 
+test('return followups use SKU quantities, explicit FBA destination and current file and candidate contracts', async () => {
+  const source = await readFile(new URL('./phase4-overseas-return-followups.mjs', import.meta.url), 'utf8')
+  assert.match(source, /items: \[\{ skuCode: sku, quantity: 1 \}\]/)
+  assert.match(source, /destinationFbaWarehouseId: id\(destination.id\)/)
+  assert.match(source, /destinationFbaWarehouseCode: destination.warehouseCode/)
+  assert.match(source, /status === 'PENDING_REVIEW'/)
+  assert.match(source, /skuCodes\?\.includes\?\.\(sku\)/)
+  assert.match(source, /cartonTotalFileId/)
+  assert.match(source, /customerId, warehouseId: warehouse.id/)
+  assert.doesNotMatch(source, /form, \{\}, merchantToken/)
+})
+
 test('validation predicate rejects outages, permission failures, success and missing diagnostics', () => {
   const response = { http: 200, body: { code: 'A0422' }, requestId: 'request', traceId: 'trace' }
   assert.equal(validationFailure(response), true)
diff --git a/scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs b/scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs
index 18f427499..20dd73f1e 100644
--- a/scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs
+++ b/scripts/admin-test-env-modules/return-boundary-scenarios-contract.test.mjs
@@ -131,3 +131,15 @@ test('高价值扩展覆盖混合回滚、同键合箱、同码隔离、权限
   assert.match(source, /snapshot: withLedger[\s\S]*签收重放不重复产生流水/)
   assert.match(source, /sameKeyResponses/)
 })
+
+test('边界fixture遵守审核、单SKU托盘和完工照片新契约', async () => {
+  const source = await readFile(new URL('return-boundary-scenarios.mjs', import.meta.url), 'utf8')
+  assert.match(source, /customerByToken\.set\(tokenB, String\(fixtureB\.tenantId\)\)/)
+  assert.match(source, /'X-Customer-Id': customerId/)
+  assert.match(source, /status !== 'PENDING_REVIEW'/)
+  assert.match(source, /palletCode: order\.palletCode/)
+  assert.match(source, /requestOverseasMultipart\('POST',[^\n]+form, operator\.token\)/)
+  assert.match(source, /两个合法SKU同批签收仍整笔拒绝/)
+  assert.match(source, /palletCode: nextPallet\.palletCode/)
+  assert.doesNotMatch(source, /\['receiptNo', 'receiptBatchNo', 'cartonMark'\]/)
+})
diff --git a/scripts/database-schema-contract.mjs b/scripts/database-schema-contract.mjs
index f5728f720..f5577675d 100644
--- a/scripts/database-schema-contract.mjs
+++ b/scripts/database-schema-contract.mjs
@@ -69,7 +69,7 @@ function parseExpected(sql) {
     const table = start[2]
     const columns = new Set()
     for (const line of body) {
-      const field = line.match(/^\s+`([a-z][a-z0-9_]*)`\s+/i)
+      const field = line.match(/^\s+(?!(?:PRIMARY|UNIQUE|KEY|CONSTRAINT|CHECK|FOREIGN)\b)`?([a-z][a-z0-9_]*)`?\s+/i)
       if (field) columns.add(field[1])
     }
     if (!columns.size) continue
diff --git a/scripts/database-schema-diff.mjs b/scripts/database-schema-diff.mjs
new file mode 100644
index 000000000..243b8185a
--- /dev/null
+++ b/scripts/database-schema-diff.mjs
@@ -0,0 +1,161 @@
+#!/usr/bin/env node
+
+import { readFile } from 'node:fs/promises'
+import { spawnSync } from 'node:child_process'
+import path from 'node:path'
+import process from 'node:process'
+
+const DEFAULT_SCHEMAS = [
+  'baiyue_auth', 'baiyue_iam', 'baiyue_order', 'baiyue_warehouse',
+  'baiyue_firstleg', 'baiyue_file', 'baiyue_audit', 'baiyue_event_bridge',
+  'baiyue_finance', 'baiyue_lastleg', 'baiyue_lastlag_warehouse',
+  'baiyue_event_bridge_overseas',
+]
+
+function usage() {
+  console.log('用法：node scripts/database-schema-diff.mjs --left-env <env文件> --right-env <env文件> [--schemas schema1,schema2] [--json]')
+  console.log('env 键：CHONGCHONG_ENV、CHONGCHONG_DB_HOST、CHONGCHONG_DB_PORT、CHONGCHONG_DB_USERNAME、CHONGCHONG_DB_PASSWORD')
+  console.log('只查询 information_schema；不读取业务数据，不执行 DDL/DML。差异退出码为 1，执行错误退出码为 2。')
+}
+
+function argument(argv, name) {
+  const index = argv.indexOf(name)
+  return index >= 0 ? argv[index + 1] : undefined
+}
+
+function parseArguments(argv) {
+  if (argv.includes('--help') || argv.includes('-h')) return { help: true }
+  const leftEnv = argument(argv, '--left-env')
+  const rightEnv = argument(argv, '--right-env')
+  if (!leftEnv || !rightEnv) throw new Error('必须同时指定 --left-env 和 --right-env')
+  const schemasValue = argument(argv, '--schemas')
+  const schemas = schemasValue ? schemasValue.split(',').map((item) => item.trim()).filter(Boolean) : DEFAULT_SCHEMAS
+  if (!schemas.length || schemas.some((schema) => !/^[a-z][a-z0-9_]*$/i.test(schema))) throw new Error('--schemas 包含无效 schema 名称')
+  return { leftEnv: path.resolve(leftEnv), rightEnv: path.resolve(rightEnv), schemas: [...new Set(schemas)], json: argv.includes('--json') }
+}
+
+function unquote(value) {
+  const trimmed = value.trim()
+  if (trimmed.length >= 2 && trimmed[0] === trimmed.at(-1) && ['"', "'"].includes(trimmed[0])) return trimmed.slice(1, -1)
+  return trimmed
+}
+
+async function readConfig(file) {
+  const values = {}
+  const source = await readFile(file, 'utf8')
+  for (const line of source.split(/\r?\n/)) {
+    const match = line.match(/^\s*(?:export\s+)?([A-Z][A-Z0-9_]*)\s*=\s*(.*)$/)
+    if (match) values[match[1]] = unquote(match[2])
+  }
+  const required = ['CHONGCHONG_DB_HOST', 'CHONGCHONG_DB_PORT', 'CHONGCHONG_DB_USERNAME', 'CHONGCHONG_DB_PASSWORD']
+  const missing = required.filter((key) => !values[key])
+  if (missing.length) throw new Error(`${path.basename(file)} 缺少：${missing.join(', ')}`)
+  return { ...values, label: values.CHONGCHONG_ENV || path.basename(file) }
+}
+
+function sqlStrings(values) {
+  return values.map((value) => `'${value.replaceAll("'", "''")}'`).join(',')
+}
+
+function runMysql(config, sql) {
+  const executable = process.env.MYSQL_BIN || 'mysql'
+  const result = spawnSync(executable, [
+    '--protocol=TCP', '-h', config.CHONGCHONG_DB_HOST, '-P', config.CHONGCHONG_DB_PORT,
+    '-u', config.CHONGCHONG_DB_USERNAME, '--batch', '--raw', '--skip-column-names',
+    '--default-character-set=utf8mb4', '-e', sql,
+  ], {
+    encoding: 'utf8',
+    env: { ...process.env, MYSQL_PWD: config.CHONGCHONG_DB_PASSWORD },
+    maxBuffer: 32 * 1024 * 1024,
+  })
+  if (result.error) throw new Error(`${config.label} mysql 客户端执行失败：${result.error.message}`)
+  if (result.status !== 0) throw new Error(`${config.label} 元数据查询失败：${(result.stderr || result.stdout).trim()}`)
+  return result.stdout.trim().split(/\r?\n/).filter(Boolean).map((line) => JSON.parse(line))
+}
+
+function snapshot(config, schemas) {
+  const selected = sqlStrings(schemas)
+  const schemaRows = runMysql(config, `SELECT JSON_OBJECT('schema', SCHEMA_NAME) FROM information_schema.SCHEMATA WHERE SCHEMA_NAME IN (${selected}) ORDER BY SCHEMA_NAME`)
+  const tableRows = runMysql(config, `SELECT JSON_OBJECT('schema', TABLE_SCHEMA, 'table', TABLE_NAME, 'type', TABLE_TYPE, 'engine', COALESCE(ENGINE, ''), 'collation', COALESCE(TABLE_COLLATION, '')) FROM information_schema.TABLES WHERE TABLE_SCHEMA IN (${selected}) ORDER BY TABLE_SCHEMA, TABLE_NAME`)
+  const columnRows = runMysql(config, `SELECT JSON_OBJECT('schema', TABLE_SCHEMA, 'table', TABLE_NAME, 'column', COLUMN_NAME, 'ordinal', ORDINAL_POSITION, 'type', COLUMN_TYPE, 'nullable', IS_NULLABLE, 'defaultValue', COLUMN_DEFAULT, 'extra', EXTRA, 'charset', CHARACTER_SET_NAME, 'collation', COLLATION_NAME, 'generation', GENERATION_EXPRESSION) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA IN (${selected}) ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION`)
+  return { schemas: schemaRows, tables: tableRows, columns: columnRows }
+}
+
+function keyed(rows, keyOf, normalized) {
+  return new Map(rows.map((row) => [keyOf(row), normalized(row)]))
+}
+
+function compareMaps(left, right) {
+  const leftOnly = [...left.keys()].filter((key) => !right.has(key)).sort()
+  const rightOnly = [...right.keys()].filter((key) => !left.has(key)).sort()
+  const changed = [...left.keys()].filter((key) => right.has(key) && JSON.stringify(left.get(key)) !== JSON.stringify(right.get(key))).sort()
+    .map((key) => ({ key, left: left.get(key), right: right.get(key) }))
+  return { leftOnly, rightOnly, changed }
+}
+
+export function compareSnapshots(left, right) {
+  const schemaKey = (row) => row.schema
+  const tableKey = (row) => `${row.schema}.${row.table}`
+  const columnKey = (row) => `${row.schema}.${row.table}.${row.column}`
+  const schemas = compareMaps(keyed(left.schemas, schemaKey, () => true), keyed(right.schemas, schemaKey, () => true))
+  const tables = compareMaps(
+    keyed(left.tables, tableKey, ({ type, engine, collation }) => ({ type, engine, collation })),
+    keyed(right.tables, tableKey, ({ type, engine, collation }) => ({ type, engine, collation })),
+  )
+  const normalizeColumn = ({ type, nullable, defaultValue, extra, charset, collation, generation }) => (
+    { type, nullable, defaultValue, extra, charset, collation, generation }
+  )
+  const columns = compareMaps(keyed(left.columns, columnKey, normalizeColumn), keyed(right.columns, columnKey, normalizeColumn))
+  return { schemas, tables, columns }
+}
+
+function count(diff) {
+  return diff.leftOnly.length + diff.rightOnly.length + diff.changed.length
+}
+
+function printSection(title, diff, leftLabel, rightLabel) {
+  if (!count(diff)) return
+  console.log(`\n${title}`)
+  for (const key of diff.leftOnly) console.log(`  仅 ${leftLabel}: ${key}`)
+  for (const key of diff.rightOnly) console.log(`  仅 ${rightLabel}: ${key}`)
+  for (const item of diff.changed) {
+    console.log(`  定义不同: ${item.key}`)
+    console.log(`    ${leftLabel}: ${JSON.stringify(item.left)}`)
+    console.log(`    ${rightLabel}: ${JSON.stringify(item.right)}`)
+  }
+}
+
+async function main() {
+  const options = parseArguments(process.argv.slice(2))
+  if (options.help) return usage()
+  const [leftConfig, rightConfig] = await Promise.all([readConfig(options.leftEnv), readConfig(options.rightEnv)])
+  if (leftConfig.label === rightConfig.label) throw new Error(`两侧环境标签相同：${leftConfig.label}`)
+  const [left, right] = [snapshot(leftConfig, options.schemas), snapshot(rightConfig, options.schemas)]
+  const differences = compareSnapshots(left, right)
+  const result = {
+    left: leftConfig.label,
+    right: rightConfig.label,
+    checkedSchemas: options.schemas,
+    summary: {
+      schemas: count(differences.schemas),
+      tables: count(differences.tables),
+      columns: count(differences.columns),
+    },
+    differences,
+  }
+  if (options.json) console.log(JSON.stringify(result, null, 2))
+  else {
+    console.log(`数据库结构比较：${result.left} <-> ${result.right}`)
+    console.log(`检查 schema=${options.schemas.length}；schema 差异=${result.summary.schemas}，表差异=${result.summary.tables}，字段差异=${result.summary.columns}`)
+    printSection('SCHEMA 差异', differences.schemas, result.left, result.right)
+    printSection('表差异', differences.tables, result.left, result.right)
+    printSection('字段差异', differences.columns, result.left, result.right)
+  }
+  if (Object.values(result.summary).some((value) => value > 0)) process.exitCode = 1
+}
+
+const isEntryPoint = process.argv[1] && path.resolve(process.argv[1]) === path.resolve(new URL(import.meta.url).pathname.replace(/^\/(?:[A-Za-z]:)/, (value) => value.slice(1)))
+if (isEntryPoint) main().catch((error) => {
+  console.error(`DATABASE_SCHEMA_DIFF_ERROR: ${error.message}`)
+  process.exitCode = 2
+})
diff --git a/scripts/database-schema-diff.test.mjs b/scripts/database-schema-diff.test.mjs
new file mode 100644
index 000000000..91cd6c281
--- /dev/null
+++ b/scripts/database-schema-diff.test.mjs
@@ -0,0 +1,34 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+
+import { compareSnapshots } from './database-schema-diff.mjs'
+
+test('database schema diff ignores column order but catches contract changes', () => {
+  const left = {
+    schemas: [{ schema: 'sample' }],
+    tables: [{ schema: 'sample', table: 'orders', type: 'BASE TABLE', engine: 'InnoDB', collation: 'utf8mb4_0900_ai_ci' }],
+    columns: [
+      { schema: 'sample', table: 'orders', column: 'id', ordinal: 1, type: 'bigint', nullable: 'NO', defaultValue: null, extra: '', charset: null, collation: null, generation: '' },
+    ],
+  }
+  const reordered = structuredClone(left)
+  reordered.columns[0].ordinal = 9
+  assert.deepEqual(compareSnapshots(left, reordered).columns, { leftOnly: [], rightOnly: [], changed: [] })
+
+  reordered.columns[0].nullable = 'YES'
+  const changed = compareSnapshots(left, reordered).columns.changed
+  assert.equal(changed.length, 1)
+  assert.equal(changed[0].key, 'sample.orders.id')
+})
+
+test('database schema diff reports objects present on only one side', () => {
+  const left = { schemas: [{ schema: 'sample' }], tables: [], columns: [] }
+  const right = {
+    schemas: [{ schema: 'sample' }],
+    tables: [{ schema: 'sample', table: 'orders', type: 'BASE TABLE', engine: 'InnoDB', collation: 'utf8mb4_0900_ai_ci' }],
+    columns: [{ schema: 'sample', table: 'orders', column: 'id', type: 'bigint', nullable: 'NO', defaultValue: null, extra: '', charset: null, collation: null, generation: '' }],
+  }
+  const diff = compareSnapshots(left, right)
+  assert.deepEqual(diff.tables.rightOnly, ['sample.orders'])
+  assert.deepEqual(diff.columns.rightOnly, ['sample.orders.id'])
+})
diff --git a/scripts/db/test-return-relabel-checks.sql b/scripts/db/test-return-relabel-checks.sql
new file mode 100644
index 000000000..2d2db3b45
--- /dev/null
+++ b/scripts/db/test-return-relabel-checks.sql
@@ -0,0 +1,18 @@
+-- Test-only targeted alignment with the authoritative Lastleg initialization checks.
+-- Execute only against the explicitly authorized test connection; no row updates.
+-- Both old checks must exist. Failure must stop execution, not disable enforcement.
+ALTER TABLE baiyue_lastleg.ll_return_inventory_carton
+  DROP CHECK chk_ll_return_inventory_carton_quantity,
+  DROP CHECK chk_ll_return_inventory_carton_status,
+  ADD CONSTRAINT chk_ll_return_inventory_carton_quantity CHECK (
+    (status IN ('AVAILABLE', 'RELABEL_PENDING', 'OUTBOUNDED') AND sku_types > 0 AND total_quantity > 0)
+    OR (status = 'MERGED' AND sku_types = 0 AND total_quantity = 0)
+  ),
+  ADD CONSTRAINT chk_ll_return_inventory_carton_status CHECK (
+    status IN ('AVAILABLE', 'RELABEL_PENDING', 'MERGED', 'OUTBOUNDED')
+  );
+
+SELECT CONSTRAINT_NAME, CHECK_CLAUSE
+FROM information_schema.CHECK_CONSTRAINTS
+WHERE CONSTRAINT_SCHEMA = 'baiyue_lastleg'
+  AND CONSTRAINT_NAME IN ('chk_ll_return_inventory_carton_quantity', 'chk_ll_return_inventory_carton_status');

From 8ada2ef67325166371234f62a5a5ee10cfa2432e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 18:54:40 +0800
Subject: [PATCH 22/26] fix(lastleg): bind merged return inventory to reusable
 target pallet

---
 .../service/ReturnInventoryService.java              |  9 +++++++++
 .../service/ReturnInventoryServiceTest.java          | 12 +++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
index d8b4bfa9f..62f63a88d 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java
@@ -58,6 +58,7 @@ public class ReturnInventoryService {
     @Resource private com.baiyue.lastleg.returnreceipt.mapper.ReturnReceiptMapper receiptMapper;
     @Resource private LastlegOrderMapper lastlegOrders;
     @Resource private LastlegOrderDetailMapper lastlegOrderDetails;
+    @Resource private com.baiyue.lastleg.palletops.gateway.PalletPhysicalGateway physicalPallets;
 
     @Transactional
     public ReturnInventoryCarton createReceiptCarton(ReturnOrder order, ReturnReceipt receipt,
@@ -300,6 +301,14 @@ public class ReturnInventoryService {
         if (total <= 0) throw badRequest("至少填写一个大于 0 的 SKU 合箱数量");
         long targetId = IdWorker.getId();
         ReturnInventoryCarton target = new ReturnInventoryCarton();
+        // Stable across transaction rollback/retry; a generated target ID would leak a new resource on every retry.
+        String palletBusinessKey = "RETURN-MERGE:" + hash(List.of(identity.operatorKey(), key, requestHash));
+        var pallet = physicalPallets.ensureRelabelPallet(identity.overseasWarehouseId(), palletBusinessKey);
+        if (pallet == null || pallet.warehouseId() != identity.overseasWarehouseId()
+            || pallet.palletId() <= 0 || text(pallet.palletCode()) == null) {
+            throw conflict("合箱目标托盘资源无效，请核对后重试");
+        }
+        target.setPalletCode(pallet.palletCode());
         target.setId(targetId); target.setCustomerId(customerId); target.setOverseasWarehouseId(sources.get(0).getOverseasWarehouseId());
         target.setCartonMark(numbers.next("RETURN_CARTON", target.getOverseasWarehouseId(), targetId)); target.setSourceBatchNo(String.join(",", consumedBatchNos)); target.setSourceReturnNo(String.join(",", consumedReturnNos)); target.setStatus(AVAILABLE);
         target.setSkuTypes(requested.size()); target.setTotalQuantity(total); target.setLength(request.length()); target.setWidth(request.width()); target.setHeight(request.height()); target.setWeight(request.weight()); target.setCreatedAt(now); target.setUpdatedAt(now); cartons.insert(target);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
index e1adb845e..da1149160 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryServiceTest.java
@@ -50,6 +50,7 @@ class ReturnInventoryServiceTest {
     @Mock LastlegOrderNoGenerator numbers;
     @Mock ReturnOrderMapper orders;
     @Mock ReturnReceiptMapper receipts;
+    @Mock com.baiyue.lastleg.palletops.gateway.PalletPhysicalGateway physicalPallets;
     private ReturnInventoryService service;
 
     @BeforeEach
@@ -64,6 +65,7 @@ class ReturnInventoryServiceTest {
         ReflectionTestUtils.setField(service, "numbers", numbers);
         ReflectionTestUtils.setField(service, "orders", orders);
         ReflectionTestUtils.setField(service, "receiptMapper", receipts);
+        ReflectionTestUtils.setField(service, "physicalPallets", physicalPallets);
     }
 
     @Test
@@ -142,6 +144,8 @@ class ReturnInventoryServiceTest {
         when(cartons.lockMark("RC-SOURCE")).thenReturn(source);
         when(cartonItems.lockCarton(31L)).thenReturn(List.of(skuA, skuB));
         when(numbers.next(anyString(), anyString(), anyLong())).thenReturn("RC-MERGED");
+        when(physicalPallets.ensureRelabelPallet(org.mockito.ArgumentMatchers.eq(42L), anyString()))
+            .thenReturn(new com.baiyue.lastleg.palletops.gateway.PalletPhysicalGateway.PalletReference(91L, "PLT-MERGED", 42L, null, "EMPTY", null, 0));
         when(balances.adjustCartonQuantity(anyString(), anyString(), anyString(), anyLong())).thenReturn(1);
 
         service.merge(new PdaWarehouseIdentity("operator-1", "操作员", 42L),
@@ -158,6 +162,10 @@ class ReturnInventoryServiceTest {
         verify(cartons).insert(target.capture());
         assertThat(target.getValue().getSourceBatchNo()).isEqualTo("RB-1");
         assertThat(target.getValue().getSourceReturnNo()).isEqualTo("RT-1");
+        assertThat(target.getValue().getPalletCode()).isEqualTo("PLT-MERGED");
+        ArgumentCaptor<String> businessKey = ArgumentCaptor.forClass(String.class);
+        verify(physicalPallets).ensureRelabelPallet(org.mockito.ArgumentMatchers.eq(42L), businessKey.capture());
+        assertThat(businessKey.getValue()).matches("RETURN-MERGE:[0-9a-f]{64}");
     }
 
     @Test
@@ -190,6 +198,8 @@ class ReturnInventoryServiceTest {
         ReturnInventoryCarton locked = prepareConcurrentSource();
         when(cartonItems.lockCarton(31L)).thenReturn(List.of(item(41L, "SKU-A", 2L)));
         when(numbers.next(anyString(), anyString(), anyLong())).thenReturn("RC-TARGET");
+        when(physicalPallets.ensureRelabelPallet(org.mockito.ArgumentMatchers.eq(42L), anyString()))
+            .thenReturn(new com.baiyue.lastleg.palletops.gateway.PalletPhysicalGateway.PalletReference(92L, "PLT-TARGET", 42L, null, "EMPTY", null, 0));
         when(balances.adjustCartonQuantity(anyString(), anyString(), anyString(), anyLong())).thenReturn(1);
         service.merge(new PdaWarehouseIdentity("operator-2", "操作员2", 42L), mergeRequest(2));
         assertThat(locked.getTotalQuantity()).isZero();
@@ -224,7 +234,7 @@ class ReturnInventoryServiceTest {
         verify(cartons, never()).insert(any(ReturnInventoryCarton.class));
         verify(cartonItems, never()).insert(any(ReturnInventoryCartonItem.class));
         verify(operations, never()).updateById(any(ReturnInventoryOperation.class));
-        verifyNoInteractions(orders, receipts, balances, numbers);
+        verifyNoInteractions(orders, receipts, balances, numbers, physicalPallets);
     }
 
     @Test

From bf99bf9048fe26e5935a6dde48168c0274acc06e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 19:08:42 +0800
Subject: [PATCH 23/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../baiyue_file/V1__align_schema_baseline.sql | 10 ++-
 .../V1__align_schema_baseline.sql             | 10 ++-
 .../baiyue_iam/V1__align_schema_baseline.sql  | 24 ++++---
 .../V2__align_schema_baseline.sql             | 62 ++++++++++---------
 .../phase4-overseas-return-followups.mjs      |  7 ++-
 ...-overseas-return-receipt-contract.test.mjs | 12 +++-
 ...ema-alignment-migrations-contract.test.mjs | 47 ++++++++++++++
 7 files changed, 124 insertions(+), 48 deletions(-)
 create mode 100644 scripts/database-schema-alignment-migrations-contract.test.mjs

diff --git a/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
index f80f99e07..da1641e0b 100644
--- a/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
+++ b/deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql
@@ -8,13 +8,17 @@ SET NAMES utf8mb4;
 
 SET @guard = IF(
   EXISTS (SELECT 1 FROM file_object WHERE CHAR_LENGTH(business_type) > 32 LIMIT 1),
-  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''file_object.business_type exceeds 32 characters''',
+  'SELECT 1 FROM migration_blocked_file_business_type_exceeds_32_chars',
   'SELECT 1'
 );
 PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
-ALTER TABLE file_object
-  MODIFY COLUMN business_type varchar(32) DEFAULT NULL COMMENT '关联业务类型';
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'file_object' AND column_name = 'business_type' AND (column_type <> 'varchar(32)' OR is_nullable <> 'YES')),
+  'ALTER TABLE file_object MODIFY COLUMN business_type varchar(32) DEFAULT NULL COMMENT ''关联业务类型''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
 CREATE TABLE IF NOT EXISTS file_pda_release_channel (
   app_code varchar(16) NOT NULL,
diff --git a/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
index f63d365d5..3ae25fb1d 100644
--- a/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
+++ b/deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql
@@ -8,10 +8,14 @@ SET NAMES utf8mb4;
 
 SET @guard = IF(
   EXISTS (SELECT 1 FROM fl_dropship_pallet WHERE pallet_no IS NULL LIMIT 1),
-  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''fl_dropship_pallet.pallet_no contains NULL''',
+  'SELECT 1 FROM migration_blocked_firstleg_pallet_no_contains_null',
   'SELECT 1'
 );
 PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
-ALTER TABLE fl_dropship_pallet
-  MODIFY COLUMN pallet_no varchar(32) NOT NULL COMMENT '现场扫描的系统DP托盘码';
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'fl_dropship_pallet' AND column_name = 'pallet_no' AND (column_type <> 'varchar(32)' OR is_nullable <> 'NO')),
+  'ALTER TABLE fl_dropship_pallet MODIFY COLUMN pallet_no varchar(32) NOT NULL COMMENT ''现场扫描的系统DP托盘码''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql b/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
index eee539c55..e6005ed14 100644
--- a/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
+++ b/deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql
@@ -8,28 +8,36 @@ SET NAMES utf8mb4;
 
 SET @guard = IF(
   EXISTS (SELECT 1 FROM iam_tenant WHERE customer_nickname IS NULL LIMIT 1),
-  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant.customer_nickname contains NULL''',
+  'SELECT 1 FROM migration_blocked_iam_customer_nickname_contains_null',
   'SELECT 1'
 );
 PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
 SET @guard = IF(
   EXISTS (SELECT 1 FROM iam_tenant WHERE CHAR_LENGTH(tenant_code) > 8 LIMIT 1),
-  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant.tenant_code exceeds 8 characters''',
+  'SELECT 1 FROM migration_blocked_iam_tenant_code_exceeds_8_chars',
   'SELECT 1'
 );
 PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
 SET @guard = IF(
   EXISTS (SELECT 1 FROM iam_tenant_qualification WHERE original_file_name IS NULL LIMIT 1),
-  'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''iam_tenant_qualification.original_file_name contains NULL''',
+  'SELECT 1 FROM migration_blocked_iam_original_file_name_contains_null',
   'SELECT 1'
 );
 PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
-ALTER TABLE iam_tenant
-  MODIFY COLUMN tenant_code varchar(8) NOT NULL COMMENT '客户编号：企业客户固定五位数字，平台技术主体为PLATFORM',
-  MODIFY COLUMN customer_nickname varchar(32) NOT NULL COMMENT '客户昵称：创建时默认取公司名称中文拼音大写首字母，可修改';
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'tenant_code' AND (column_type <> 'varchar(8)' OR is_nullable <> 'NO'))
+  OR EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'customer_nickname' AND (column_type <> 'varchar(32)' OR is_nullable <> 'NO')),
+  'ALTER TABLE iam_tenant MODIFY COLUMN tenant_code varchar(8) NOT NULL COMMENT ''客户编号：企业客户固定五位数字，平台技术主体为PLATFORM'', MODIFY COLUMN customer_nickname varchar(32) NOT NULL COMMENT ''客户昵称：创建时默认取公司名称中文拼音大写首字母，可修改''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
-ALTER TABLE iam_tenant_qualification
-  MODIFY COLUMN original_file_name varchar(255) NOT NULL COMMENT '上传时原始文件名';
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant_qualification' AND column_name = 'original_file_name' AND (column_type <> 'varchar(255)' OR is_nullable <> 'NO')),
+  'ALTER TABLE iam_tenant_qualification MODIFY COLUMN original_file_name varchar(255) NOT NULL COMMENT ''上传时原始文件名''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
diff --git a/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql b/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
index 610f04578..b8369fedf 100644
--- a/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
+++ b/deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql
@@ -6,6 +6,22 @@
 
 SET NAMES utf8mb4;
 
+-- 收紧测试库漂移字段前先阻断不满足目标定义的数据，不执行自动回填或清理。
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_delivery_order WHERE delivery_group_key IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_delivery_group_key_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_local_looseboard_order WHERE container_type IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_looseboard_container_type_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_us_truck_order WHERE container_type IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_truck_container_type_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_outbound_pda_pick WHERE inventory_position_id IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_inventory_position_id_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE new_sku_code IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_new_sku_code_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE source_warehouse_id IS NULL LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_source_warehouse_id_null', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_pda_task WHERE CHAR_LENGTH(review_decision) > 16 LIMIT 1), 'SELECT 1 FROM migration_blocked_lastleg_review_decision_exceeds_16_chars', 'SELECT 1');
+PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
 -- 测试环境当前缺失、生产已存在的 PDA 废弃作业字段。
 SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_cargo_discard_item' AND column_name = 'actual_discard_packages'), 'ALTER TABLE ll_cargo_discard_item ADD COLUMN actual_discard_packages int NULL COMMENT ''PDA确认实际废弃箱数'' AFTER discard_packages', 'SELECT 1');
 PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -28,35 +44,23 @@ PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 SET @ddl = IF(NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_return_receipt' AND column_name = 'pallet_code'), 'ALTER TABLE ll_return_receipt ADD COLUMN pallet_code varchar(128) COLLATE utf8mb4_unicode_ci NULL COMMENT ''本次签收绑定的托盘码'' AFTER carton_mark', 'SELECT 1');
 PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
--- 收紧测试库漂移字段前先阻断不满足目标定义的数据，不执行自动回填或清理。
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_delivery_order WHERE delivery_group_key IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_delivery_order.delivery_group_key contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_local_looseboard_order WHERE container_type IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_local_looseboard_order.container_type contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_us_truck_order WHERE container_type IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_us_truck_order.container_type contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_outbound_pda_pick WHERE inventory_position_id IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_outbound_pda_pick.inventory_position_id contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE new_sku_code IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_item.new_sku_code contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_item WHERE source_warehouse_id IS NULL LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_item.source_warehouse_id contains NULL''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-SET @guard = IF(EXISTS (SELECT 1 FROM ll_relabel_pda_task WHERE CHAR_LENGTH(review_decision) > 16 LIMIT 1), 'SIGNAL SQLSTATE ''45000'' SET MESSAGE_TEXT = ''ll_relabel_pda_task.review_decision exceeds 16 characters''', 'SELECT 1');
-PREPARE stmt FROM @guard; EXECUTE stmt; DEALLOCATE PREPARE stmt;
-
-ALTER TABLE ll_delivery_order
-  MODIFY COLUMN delivery_group_key varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '同一出库单内按目的FBA仓拆单的稳定分组键';
-ALTER TABLE ll_local_looseboard_order
-  MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ';
-ALTER TABLE ll_us_truck_order
-  MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ';
-ALTER TABLE ll_outbound_pda_pick
-  MODIFY COLUMN inventory_position_id bigint NOT NULL COMMENT '库存仓位ID';
-ALTER TABLE ll_relabel_item
-  MODIFY COLUMN new_sku_code varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '换标后SKU编码',
-  MODIFY COLUMN source_warehouse_id varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '原海外中转仓ID';
-ALTER TABLE ll_relabel_pda_task
-  MODIFY COLUMN review_decision varchar(16) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '最近复核结论：APPROVE或REWORK';
+SET @ddl = IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_delivery_order' AND column_name = 'delivery_group_key' AND (column_type <> 'varchar(255)' OR is_nullable <> 'NO' OR collation_name <> 'utf8mb4_unicode_ci')), 'ALTER TABLE ll_delivery_order MODIFY COLUMN delivery_group_key varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT ''同一出库单内按目的FBA仓拆单的稳定分组键''', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_local_looseboard_order' AND column_name = 'container_type' AND (column_type <> 'varchar(32)' OR is_nullable <> 'NO' OR column_default <> '40HQ' OR collation_name <> 'utf8mb4_unicode_ci')), 'ALTER TABLE ll_local_looseboard_order MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''40HQ'' COMMENT ''平台统一柜型：40GP、40HQ、45HQ''', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_us_truck_order' AND column_name = 'container_type' AND (column_type <> 'varchar(32)' OR is_nullable <> 'NO' OR column_default <> '40HQ' OR collation_name <> 'utf8mb4_unicode_ci')), 'ALTER TABLE ll_us_truck_order MODIFY COLUMN container_type varchar(32) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT ''40HQ'' COMMENT ''平台统一柜型：40GP、40HQ、45HQ''', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_outbound_pda_pick' AND column_name = 'inventory_position_id' AND (column_type <> 'bigint' OR is_nullable <> 'NO')), 'ALTER TABLE ll_outbound_pda_pick MODIFY COLUMN inventory_position_id bigint NOT NULL COMMENT ''库存仓位ID''', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(
+  EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_relabel_item' AND column_name = 'new_sku_code' AND (column_type <> 'varchar(128)' OR is_nullable <> 'NO' OR collation_name <> 'utf8mb4_unicode_ci'))
+  OR EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_relabel_item' AND column_name = 'source_warehouse_id' AND (column_type <> 'varchar(128)' OR is_nullable <> 'NO' OR collation_name <> 'utf8mb4_unicode_ci')),
+  'ALTER TABLE ll_relabel_item MODIFY COLUMN new_sku_code varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT ''换标后SKU编码'', MODIFY COLUMN source_warehouse_id varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT ''原海外中转仓ID''',
+  'SELECT 1'
+);
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+SET @ddl = IF(EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'll_relabel_pda_task' AND column_name = 'review_decision' AND (column_type <> 'varchar(16)' OR is_nullable <> 'YES' OR collation_name <> 'utf8mb4_unicode_ci')), 'ALTER TABLE ll_relabel_pda_task MODIFY COLUMN review_decision varchar(16) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT ''最近复核结论：APPROVE或REWORK''', 'SELECT 1');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
 SET @ddl = IF(
   (SELECT table_collation FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = 'll_warehouse_transfer_measurement_photo') <> 'utf8mb4_unicode_ci',
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
index 3778f0f7b..2d95f89e4 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
@@ -235,12 +235,15 @@ export async function completeReturnRelabel(context, merchantToken, pdaToken, re
   for (const [index, source] of sources.entries()) {
     const target = await command(pdaToken, 'POST', '生成本轮带目的仓换标托盘', `${pallets}/relabel-pallet-label`,
       { relabelNo, idempotencyKey: key(context, `RETURN-PALLET-${index}`) })
-    const from = await command(pdaToken, 'POST', '回查来源托盘版本', `${pallets}/resolve`, { code: source.palletCode })
-    const to = await command(pdaToken, 'POST', '回查目标托盘版本', `${pallets}/resolve`, { code: target.palletCode })
+    const from = await command(pdaToken, 'POST', '回查来源托盘版本', `${pallets}/pallets/resolve`, { code: source.palletCode })
+    const to = await command(pdaToken, 'POST', '回查目标托盘版本', `${pallets}/pallets/resolve`, { code: target.palletCode })
     require('组托仅使用本轮任务箱唛', source.cartonMarks?.length > 0
       && source.cartonMarks.every(mark => task.items.some(item => item.cartonMark === mark)))
     const body = { relabelNo, source: { palletCode: from.palletCode, expectedVersion: Number(from.palletVersion) },
       target: { palletCode: to.palletCode, expectedVersion: Number(to.palletVersion) },
+      actualSource: { positionId: source.positionId, expectedPositionVersion: Number(source.positionVersion),
+        packages: task.items.filter(item => source.cartonMarks.includes(item.cartonMark))
+          .reduce((sum, item) => sum + Number(item.expectedPackages), 0) },
       cartonMarks: source.cartonMarks, idempotencyKey: key(context, `RETURN-BIND-${index}`), reason: context.marker }
     const bound = await command(pdaToken, 'POST', '退货换标按实际数量绑定目标托盘', `${pallets}/relabel-disassemble`, body)
     const replay = await command(pdaToken, 'POST', '退货换标组托原键重放', `${pallets}/relabel-disassemble`, body)
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
index cef04d8e8..d32d4054b 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
@@ -17,10 +17,16 @@ test('return relabel lifecycle requires review, quantities, binding, photo and c
       calls.push({ method, path, body, token })
       let data = task
       if (path.endsWith('/status')) data = { application: { relabelNo: 'RL-1', status: 'PENDING_PROCESSING' } }
-      if (path.endsWith('/relabel-sources')) data = [{ palletCode: 'OLD', cartonMarks: ['BOX'] }]
+      if (path.endsWith('/relabel-sources')) data = [{ positionId: '12', positionVersion: 0, palletCode: 'OLD', cartonMarks: ['BOX'] }]
       if (path.endsWith('/relabel-pallet-label')) data = { palletCode: 'NEW' }
-      if (path.endsWith('/resolve')) data = { palletCode: body.code, palletVersion: 1 }
-      if (path.endsWith('/relabel-disassemble')) data = { status: 'COMPLETED', operationId: '9', replayed: true }
+      if (path.endsWith('/resolve')) {
+        assert.equal(path, '/api/pda/v1/last-leg/pallet-operations/pallets/resolve')
+        data = { palletCode: body.code, palletVersion: 1 }
+      }
+      if (path.endsWith('/relabel-disassemble')) {
+        assert.deepEqual(body.actualSource, { positionId: '12', expectedPositionVersion: 0, packages: 1 })
+        data = { status: 'COMPLETED', operationId: '9', replayed: true }
+      }
       if (path.endsWith('/RL-1/complete')) data = { applicationStatus: 'CUSTOMER_CONFIRM_PENDING' }
       if (path.endsWith('/confirm-completion')) data = { application: { relabelNo: 'RL-1', status: 'COMPLETED' } }
       if (path.endsWith('/return-orders/RT-1')) data = { order: { status: 'COMPLETED', relabelNo: 'RL-1', relabelStatus: 'COMPLETED' } }
diff --git a/scripts/database-schema-alignment-migrations-contract.test.mjs b/scripts/database-schema-alignment-migrations-contract.test.mjs
new file mode 100644
index 000000000..6dd584fa6
--- /dev/null
+++ b/scripts/database-schema-alignment-migrations-contract.test.mjs
@@ -0,0 +1,47 @@
+import assert from 'node:assert/strict'
+import { readFile } from 'node:fs/promises'
+import path from 'node:path'
+import test from 'node:test'
+import { fileURLToPath } from 'node:url'
+
+const repositoryRoot = path.resolve(fileURLToPath(new URL('..', import.meta.url)))
+const migrations = {
+  iam: 'deploy/sql/migrations/cn/baiyue_iam/V1__align_schema_baseline.sql',
+  firstleg: 'deploy/sql/migrations/cn/baiyue_firstleg/V1__align_schema_baseline.sql',
+  file: 'deploy/sql/migrations/cn/baiyue_file/V1__align_schema_baseline.sql',
+  lastleg: 'deploy/sql/migrations/overseas/baiyue_lastleg/V2__align_schema_baseline.sql',
+}
+
+async function sources() {
+  return Object.fromEntries(await Promise.all(Object.entries(migrations).map(async ([name, relative]) => (
+    [name, await readFile(path.join(repositoryRoot, relative), 'utf8')]
+  ))))
+}
+
+test('schema alignment migrations contain no destructive statements', async () => {
+  for (const [name, source] of Object.entries(await sources())) {
+    assert.doesNotMatch(source, /^\s*(?:DROP|DELETE|UPDATE|TRUNCATE)\b/im, `${name} 迁移不得删除、清理或回填数据`)
+    assert.doesNotMatch(source, /\bSIGNAL\s+SQLSTATE\b/i, `${name} 迁移不得使用 MySQL 不支持的动态 SIGNAL`)
+  }
+})
+
+test('schema alignment migrations cover the verified drift', async () => {
+  const source = await sources()
+  for (const field of ['tenant_code', 'customer_nickname', 'original_file_name']) assert.match(source.iam, new RegExp(`\\b${field}\\b`))
+  assert.match(source.firstleg, /\bpallet_no\b/)
+  for (const table of ['file_pda_release_channel', 'file_pda_release']) assert.match(source.file, new RegExp(`\\b${table}\\b`))
+  for (const field of [
+    'actual_discard_packages', 'pda_status', 'pda_operator_id', 'pda_completed_at',
+    'quantity', 'pallet_code', 'discrepancy_reason', 'manually_completed_at',
+  ]) assert.match(source.lastleg, new RegExp(`\\b${field}\\b`))
+})
+
+test('constraint tightening is guarded before any alter table', async () => {
+  for (const [name, source] of Object.entries(await sources())) {
+    const firstAlter = source.search(/\bALTER TABLE\b/i)
+    const firstGuard = source.search(/SET @guard\s*=\s*IF/i)
+    if (name === 'file' || name === 'iam' || name === 'firstleg' || name === 'lastleg') {
+      assert.ok(firstGuard >= 0 && firstGuard < firstAlter, `${name} 必须先验证存量数据再执行 DDL`)
+    }
+  }
+})

From 6211230564d12182a3665ea9fae0b365e6441c43 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 19:11:53 +0800
Subject: [PATCH 24/26] fix(lastleg): preserve mixed SKU balances when
 splitting return relabel stock

---
 .../service/PdaPalletOperationService.java    | 22 +++++++-----
 .../mapper/ReturnInventoryCartonMapper.java   |  5 +--
 .../PdaPalletOperationServiceTest.java        | 35 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
index 637626f9b..8fc1a31bb 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationService.java
@@ -375,14 +375,20 @@ public class PdaPalletOperationService {
             .eq("application_id", application.getId()).eq("return_carton_id", source.getId())).size() != 1)
             throw conflict("来源托盘包含多项换标任务，不能按单 SKU 拆分，请核对库存");
         List<ReturnInventoryCartonItem> lines = returnCartonItems.lockCarton(source.getId());
-        if (lines.size() != 1 || !item.getSkuCode().equalsIgnoreCase(lines.get(0).getSkuCode())
-            || value(lines.get(0).getQuantity()) != value(source.getTotalQuantity()))
-            throw conflict("来源托盘包含其他 SKU，不能按单 SKU 拆分，请核对库存");
+        List<ReturnInventoryCartonItem> matching = lines.stream()
+            .filter(line -> item.getSkuCode().equalsIgnoreCase(line.getSkuCode())).toList();
+        if (matching.size() != 1 || quantity <= 0 || quantity > value(matching.get(0).getQuantity())
+            || lines.stream().anyMatch(line -> value(line.getQuantity()) <= 0)
+            || lines.stream().mapToLong(line -> value(line.getQuantity())).sum() != value(source.getTotalQuantity()))
+            throw conflict("来源托盘SKU数量不一致，请核对库存");
         long remaining = value(source.getTotalQuantity()) - quantity;
-        ReturnInventoryCartonItem sourceLine = lines.get(0);
-        sourceLine.setQuantity(remaining);
-        if (returnCartonItems.updateById(sourceLine) != 1
-            || returnCartons.releasePartial(source.getId(), application.getCustomerId(), application.getId(), remaining) != 1)
+        ReturnInventoryCartonItem sourceLine = matching.get(0);
+        long skuRemaining = value(sourceLine.getQuantity()) - quantity;
+        int remainingSkuTypes = lines.size() - (skuRemaining == 0 ? 1 : 0);
+        sourceLine.setQuantity(skuRemaining);
+        int changed = skuRemaining == 0 ? returnCartonItems.deleteById(sourceLine.getId()) : returnCartonItems.updateById(sourceLine);
+        if (changed != 1
+            || returnCartons.releasePartial(source.getId(), application.getCustomerId(), application.getId(), remaining, remainingSkuTypes) != 1)
             throw conflict("来源托盘数量已变化，请刷新后重试");
         LocalDateTime now = LocalDateTime.now();
         long targetId = IdWorker.getId();
@@ -403,7 +409,7 @@ public class PdaPalletOperationService {
         targetLine.setProductNameZh(sourceLine.getProductNameZh()); targetLine.setQuantity(quantity);
         if (returnCartonItems.insert(targetLine) != 1
             || returnBalances.adjustCartonQuantity(source.getCustomerId(), source.getOverseasWarehouseId(),
-                sourceLine.getSkuCode(), 1) != 1) throw conflict("退货库存拆分记账失败");
+                sourceLine.getSkuCode(), skuRemaining == 0 ? 0 : 1) != 1) throw conflict("退货库存拆分记账失败");
         item.setReturnCartonId(targetId);
         if (relabelItems.updateById(item) != 1) throw conflict("换标单来源托盘更新失败");
     }
diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
index e636fb9fb..ac0540219 100644
--- a/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
+++ b/lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryCartonMapper.java
@@ -36,12 +36,13 @@ public interface ReturnInventoryCartonMapper extends BaseMapper<ReturnInventoryC
     @Select("SELECT * FROM ll_return_inventory_carton WHERE id=#{id} FOR UPDATE")
     ReturnInventoryCarton lockId(@Param("id") long id);
 
-    @Update("UPDATE ll_return_inventory_carton SET total_quantity=#{remaining},sku_types=1,status='AVAILABLE'," +
+    @Update("UPDATE ll_return_inventory_carton SET total_quantity=#{remaining},sku_types=#{skuTypes},status='AVAILABLE'," +
         "relabel_application_id=NULL,relabel_no=NULL,relabel_status=NULL,updated_at=NOW(3) " +
         "WHERE id=#{id} AND customer_id=#{customerId} AND relabel_application_id=#{applicationId} " +
         "AND status='RELABEL_PENDING' AND total_quantity>#{remaining}")
     int releasePartial(@Param("id") long id, @Param("customerId") String customerId,
-                       @Param("applicationId") long applicationId, @Param("remaining") long remaining);
+                       @Param("applicationId") long applicationId, @Param("remaining") long remaining,
+                       @Param("skuTypes") int skuTypes);
 
     @Select("SELECT * FROM ll_return_inventory_carton WHERE source_receipt_id=#{receiptId} LIMIT 1")
     ReturnInventoryCarton findReceipt(@Param("receiptId") long receiptId);
diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
index 6ff734011..2541b2c2d 100644
--- a/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
+++ b/lastleg-service/src/test/java/com/baiyue/lastleg/palletops/service/PdaPalletOperationServiceTest.java
@@ -102,7 +102,7 @@ class PdaPalletOperationServiceTest {
         when(relabelItems.selectList(any())).thenReturn(List.of(item));
         when(returnCartonItems.lockCarton(801L)).thenReturn(List.of(originalLine));
         when(returnCartonItems.updateById(any(ReturnInventoryCartonItem.class))).thenReturn(1);
-        when(returnCartons.releasePartial(801L, "100", 600L, 70L)).thenReturn(1);
+        when(returnCartons.releasePartial(801L, "100", 600L, 70L, 1)).thenReturn(1);
         when(returnCartons.insert(any(ReturnInventoryCarton.class))).thenReturn(1);
         when(returnCartonItems.insert(any(ReturnInventoryCartonItem.class))).thenReturn(1);
         when(returnBalances.adjustCartonQuantity("100", "88", "SKU-1", 1)).thenReturn(1);
@@ -128,6 +128,39 @@ class PdaPalletOperationServiceTest {
         verifyNoInteractions(mapper);
     }
 
+    @Test void mixedSkuSplitMovesOnlySelectedSkuAndPreservesOtherSkuOnSource() {
+        RelabelApplication app = new RelabelApplication(); app.setId(600L); app.setCustomerId("100");
+        RelabelItem item = new RelabelItem(); item.setId(701L); item.setSkuCode("SKU-A");
+        item.setReturnCartonId(801L); item.setDestinationFbaWarehouseCode("SCK8");
+        ReturnInventoryCarton original = new ReturnInventoryCarton(); original.setId(801L);
+        original.setCustomerId("100"); original.setOverseasWarehouseId("88"); original.setTotalQuantity(2L);
+        original.setSourceReturnNo("RT-1"); original.setSourceBatchNo("RB-1,RB-2"); original.setPalletCode("OLD");
+        ReturnInventoryCartonItem a = new ReturnInventoryCartonItem(); a.setId(901L); a.setSkuCode("SKU-A"); a.setQuantity(1L);
+        ReturnInventoryCartonItem b = new ReturnInventoryCartonItem(); b.setId(902L); b.setSkuCode("SKU-B"); b.setQuantity(1L);
+        when(relabelItems.selectList(any())).thenReturn(List.of(item));
+        when(returnCartonItems.lockCarton(801L)).thenReturn(List.of(a, b));
+        when(returnCartonItems.deleteById(901L)).thenReturn(1);
+        when(returnCartons.releasePartial(801L, "100", 600L, 1L, 1)).thenReturn(1);
+        when(returnCartons.insert(any(ReturnInventoryCarton.class))).thenReturn(1);
+        when(returnCartonItems.insert(any(ReturnInventoryCartonItem.class))).thenReturn(1);
+        when(returnBalances.adjustCartonQuantity("100", "88", "SKU-A", 0)).thenReturn(1);
+        when(relabelItems.updateById(any(RelabelItem.class))).thenReturn(1);
+        ReflectionTestUtils.invokeMethod(service, "splitReturnRelabelCarton", app, item, original,
+            pallet(30L, "NEW", 88L, 0), 1L);
+        assertEquals(1L, b.getQuantity());
+        verify(returnCartonItems, never()).updateById(b);
+        var moved = ArgumentCaptor.forClass(ReturnInventoryCartonItem.class);
+        verify(returnCartonItems).insert(moved.capture());
+        assertEquals("SKU-A", moved.getValue().getSkuCode());
+        assertEquals(1L, moved.getValue().getQuantity());
+        var target = ArgumentCaptor.forClass(ReturnInventoryCarton.class);
+        verify(returnCartons).insert(target.capture());
+        assertEquals("RT-1", target.getValue().getSourceReturnNo());
+        assertEquals("RB-1,RB-2", target.getValue().getSourceBatchNo());
+        assertEquals("NEW", target.getValue().getPalletCode());
+        verify(returnBalances, never()).adjustCartonQuantity(eq("100"), eq("88"), eq("SKU-B"), anyLong());
+    }
+
     @Test void resolveReportsMissingOnSitePalletAsNotFound() {
         when(physical.resolve("MISSING")).thenReturn(null);
 

From 80778e017ea792362a6260bb913efd4d1e86e2df Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 19:33:51 +0800
Subject: [PATCH 25/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/admin-test-env-modules/README.md      |  2 +-
 .../phase4-overseas-return-followups.mjs      | 61 ++++++++++++++++++-
 ...-overseas-return-receipt-contract.test.mjs | 38 +++++++++++-
 3 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/scripts/admin-test-env-modules/README.md b/scripts/admin-test-env-modules/README.md
index 9d32effcc..1a281b68f 100644
--- a/scripts/admin-test-env-modules/README.md
+++ b/scripts/admin-test-env-modules/README.md
@@ -22,7 +22,7 @@
 
 `phase4-overseas-return-followups.mjs` 是独立可选后续模块，只在显式 `--modules phase4-overseas-return-followups` 时依赖并运行退货前置，再关联换标单及执行退货出库；不计入退货专项通过结论。仅复用同次运行、同 marker 的退货资源，凭据只在内存中，finally 停用其独立临时 PDA。合同检查复用 `phase4-overseas-return-receipt-contract.test.mjs`；HTTP 必须有目标环境写入授权。
 
-退货转换标请求按当前契约传 `items[{skuCode, quantity}]`、`fileScope` 和真实 FBA 目的仓 ID/编码，返回 `PENDING_REVIEW` 与 `skuCodes`。分页查找启用的 SCK8，缺失则阻断；总箱标文件回查 `cartonTotalFileId`。独立退货出库候选使用查询参数 `warehouseId`。同模块的 `completeReturnRelabel` 在独立出库之后继续审核本轮换标申请、PDA 认领与数量完成、来源托盘解析、正式生成目标托盘、组托及原键重放、上传合成完工图片、提交完工、客户确认及原键重放，最终回查原退货单仍为签收完成且换标关联一致。它不执行其他客户库存操作；目标托盘是本轮换标业务资源，不是国内基础托盘。退货 SKU 换标客户确认后为 `COMPLETED`，还需另验该换标库存的后续出库；不能把此前未冻结库存独立出库视为换标后出库。
+退货转换标请求按当前契约传 `items[{skuCode, quantity}]`、`fileScope` 和真实 FBA 目的仓 ID/编码，返回 `PENDING_REVIEW` 与 `skuCodes`。分页查找启用的 SCK8，缺失则阻断；总箱标文件回查 `cartonTotalFileId`。独立退货出库候选使用查询参数 `warehouseId`。同模块的 `completeReturnRelabel` 在独立出库之后继续审核本轮换标申请、PDA 认领与数量完成、来源托盘解析、正式生成目标托盘、组托及原键重放、上传合成完工图片、提交完工、客户确认及原键重放，最终回查原退货单仍为签收完成且换标关联一致。它不执行其他客户库存操作；目标托盘是本轮换标业务资源，不是国内基础托盘。客户确认后 `outboundRelabelledReturn` 逐箱核对本轮换标号、客户、仓库、来源单与数量，只为已完成换标的一件库存创建出库，检查创建原键重放、PDA 拣货/完成与平台、客户库存 `OUTBOUNDED` 终态；另存 `relabelOutboundNo`，不能用此前未冻结库存的独立出库结果替代。
 
 退货专项复跑命令（在后端根目录执行，每次使用新的报告名；不要与其他环境混用）：
 
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
index 2d95f89e4..36eecc1db 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-followups.mjs
@@ -198,12 +198,71 @@ export async function run(context) {
         context.createdResources.phase4OverseasReturnReceipt.returnOutboundNo = outboundNo
       }
     }
-    if (source.relabelNo) await completeReturnRelabel(context, merchantToken, picker.token, source.relabelNo, returnNo)
+    if (source.relabelNo) {
+      await completeReturnRelabel(context, merchantToken, picker.token, source.relabelNo, returnNo)
+      await outboundRelabelledReturn(context, merchantToken, picker.token, source.relabelNo, returnNo, warehouse.id)
+    }
   } finally {
     await disablePicker(context, picker, 92)
   }
 }
 
+export async function outboundRelabelledReturn(context, merchantToken, pdaToken, relabelNo, returnNo, warehouseId) {
+  const customerId = id(context.context.merchantQualificationFixture.tenantId)
+  const root = '/api/platform/v1/last-leg/outbound-orders'
+  const inventory = '/api/merchant/v1/last-leg/return-inventory/cartons'
+  const command = async (token, method, name, path, body) => {
+    const result = await overseas(context, token, method, name, path, body)
+    if (!success(result.response)) throw new Error(`${name}: ${trace(result.response)}`)
+    return result.data
+  }
+  const require = (name, value) => {
+    context.assert(MODULE, name, null, Boolean(value), `relabelNo=${relabelNo}`, OPTIONS)
+    if (!value) throw new Error(name)
+  }
+  const candidates = await command(context.overseasToken, 'GET', '查询换标完成后的退货出库候选',
+    query(`${root}/return/candidates`, { customerId, warehouseId }))
+  const selected = []
+  for (const row of (Array.isArray(candidates) ? candidates : []).filter(row => row.returnNo === returnNo)) {
+    const detail = await command(merchantToken, 'GET', '客户核对出库候选的真实换标归属', `${inventory}/${encodeURIComponent(row.cartonMark)}`)
+    if (detail.relabelNo !== relabelNo) continue
+    require('已换标候选归属数量与完成状态正确', detail.customerId === customerId
+      && detail.overseasWarehouseId === warehouseId && detail.sourceReturnNo === returnNo
+      && detail.status === 'AVAILABLE' && detail.relabelStatus === 'COMPLETED'
+      && Number(detail.totalQuantity) === 1 && detail.items?.length === 1)
+    selected.push(detail)
+  }
+  require('只出库本轮实际换标的一件库存', selected.length === 1)
+  const mark = selected[0].cartonMark
+  const body = { recipient: `${context.marker} RELABELLED RETURN`, overseasWarehouseId: warehouseId,
+    returnNo, cartonMarks: [mark], remark: context.marker, idempotencyKey: key(context, 'RELABELLED-OUTBOUND') }
+  const task = await command(context.overseasToken, 'POST', '创建本轮已换标库存出库', query(`${root}/return`, { customerId }), body)
+  const replay = await command(context.overseasToken, 'POST', '已换标库存出库创建原键重放', query(`${root}/return`, { customerId }), body)
+  require('出库重放保持同一任务和业务单', nonBlank(task.taskNo) && nonBlank(task.outboundNo)
+    && replay.taskNo === task.taskNo && replay.outboundNo === task.outboundNo)
+  const path = `/api/pda/v1/last-leg/outbound-tasks/${encodeURIComponent(task.taskNo)}`
+  const detail = await command(pdaToken, 'GET', 'PDA核对已换标库存出库任务', path)
+  const frozen = await command(context.overseasToken, 'GET', '平台核对本轮冻结出库箱号',
+    query(`${root}/${encodeURIComponent(task.outboundNo)}`, { customerId }))
+  const items = detail.items || []
+  require('出库任务只包含本轮已换标箱', detail.task?.outboundNo === task.outboundNo
+    && items.length === 1 && Number(items[0].packageCount) === 1
+    && frozen.outbound?.outboundNo === task.outboundNo && frozen.pallets?.length === 1
+    && frozen.pallets[0].cartonMarks === mark
+    && id(frozen.pallets[0].id) === id(items[0].outboundPalletItemId))
+  await command(pdaToken, 'POST', 'PDA拣取已换标库存', `${path}/pick`, {
+    outboundPalletItemId: items[0].outboundPalletItemId, inventoryPositionId: null, packages: 1,
+    cartonMarks: [mark], idempotencyKey: key(context, 'RELABELLED-PICK'),
+  })
+  const completed = await command(pdaToken, 'POST', 'PDA完成已换标库存出库', `${path}/complete`, { idempotencyKey: key(context, 'RELABELLED-COMPLETE') })
+  const outbound = await command(context.overseasToken, 'GET', '平台回查已换标出库终态', query(`${root}/${encodeURIComponent(task.outboundNo)}`, { customerId }))
+  const after = await command(merchantToken, 'GET', '客户回查已换标库存出库终态', `${inventory}/${encodeURIComponent(mark)}`)
+  require('已换标库存出库完成且来源和换标关联不漂移', completed.status === 'COMPLETED'
+    && outbound.outbound?.status === 'OUTBOUNDED' && after.status === 'OUTBOUNDED'
+    && after.relabelNo === relabelNo && after.sourceReturnNo === returnNo && Number(after.totalQuantity) === 1)
+  context.createdResources.phase4OverseasReturnReceipt.relabelOutboundNo = task.outboundNo
+}
+
 export async function completeReturnRelabel(context, merchantToken, pdaToken, relabelNo, returnNo) {
   const platform = `/api/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`
   const merchant = `/api/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}`
diff --git a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
index d32d4054b..e6a42f051 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-return-receipt-contract.test.mjs
@@ -3,11 +3,47 @@ import assert from 'node:assert/strict'
 import { readFile } from 'node:fs/promises'
 import { validationFailure, inventorySnapshot } from './phase4-overseas-return-receipt.mjs'
 import { normalizeModuleOrder } from '../admin-test-env-acceptance.mjs'
-import { completeReturnRelabel } from './phase4-overseas-return-followups.mjs'
+import { completeReturnRelabel, outboundRelabelledReturn } from './phase4-overseas-return-followups.mjs'
 
 const moduleUrl = new URL('./phase4-overseas-return-receipt.mjs', import.meta.url)
 const acceptanceUrl = new URL('../admin-test-env-acceptance.mjs', import.meta.url)
 
+test('relabelled outbound refuses another relabel application before creating an outbound', async () => {
+  const calls = []
+  const context = { marker: 'fixture', overseasToken: 'admin', context: { merchantQualificationFixture: { tenantId: '123' } },
+    addStep() {}, assert() {},
+    async requestOverseas(method, path) {
+      calls.push({ method, path })
+      return { http: 200, body: { code: '200', data: path.includes('/candidates')
+        ? [{ returnNo: 'RT-1', cartonMark: 'BOX' }] : { relabelNo: 'RL-OTHER' } } }
+    } }
+  await assert.rejects(outboundRelabelledReturn(context, 'merchant', 'pda', 'RL-1', 'RT-1', '42'), /只出库本轮/)
+  assert.ok(calls.every(call => call.method === 'GET'))
+})
+
+test('return outbound binds platform frozen carton to PDA item without requiring ordinary inventory positions', async () => {
+  const context = { marker: 'fixture', overseasToken: 'admin', context: { merchantQualificationFixture: { tenantId: '123' } },
+    createdResources: { phase4OverseasReturnReceipt: {} }, addStep() {},
+    assert(_m, name, _r, passed) { assert.ok(passed, name) },
+    async requestOverseas(method, path, body) {
+      let data
+      if (path.includes('/candidates')) data = [{ returnNo: 'RT-1', cartonMark: 'BOX' }]
+      else if (path.includes('/return-inventory/cartons/')) data = { cartonMark: 'BOX', customerId: '123',
+        overseasWarehouseId: '42', sourceReturnNo: 'RT-1', relabelNo: 'RL-1', relabelStatus: 'COMPLETED',
+        status: this.done ? 'OUTBOUNDED' : 'AVAILABLE', totalQuantity: 1, items: [{ skuCode: 'SKU', quantity: 1 }] }
+      else if (path.includes('/outbound-orders/return?')) data = { taskNo: 'TASK', outboundNo: 'OUT' }
+      else if (path.endsWith('/complete')) { this.done = true; data = { status: 'COMPLETED' } }
+      else if (path.endsWith('/pick')) {
+        assert.deepEqual(body.cartonMarks, ['BOX']); assert.equal(body.outboundPalletItemId, '9')
+        data = { status: 'IN_PROGRESS' }
+      } else if (path.includes('/outbound-orders/OUT?')) data = { outbound: { outboundNo: 'OUT', status: this.done ? 'OUTBOUNDED' : 'WAIT_PICK' }, pallets: [{ id: '9', cartonMarks: 'BOX' }] }
+      else data = { task: { outboundNo: 'OUT' }, items: [{ outboundPalletItemId: '9', packageCount: 1, positions: [] }] }
+      return { http: 200, body: { code: '200', data } }
+    } }
+  await outboundRelabelledReturn(context, 'merchant', 'pda', 'RL-1', 'RT-1', '42')
+  assert.equal(context.createdResources.phase4OverseasReturnReceipt.relabelOutboundNo, 'OUT')
+})
+
 test('return relabel lifecycle requires review, quantities, binding, photo and customer confirmation', async () => {
   const calls = []
   const task = { relabelNo: 'RL-1', version: 1, items: [{ itemId: '1', cartonMark: 'BOX', operationType: 'RETURN_BULK_SKU_LABEL', expectedPackages: 1 }] }

From 93b58fdd6da5778d7cf30bd45330c66eaec3b825 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Sun, 20 Sep 2026 19:45:24 +0800
Subject: [PATCH 26/26] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../phase4-overseas-pda-contract.test.mjs     |  8 +++++++
 .../phase4-overseas-pda.mjs                   | 23 ++++++++++++-------
 .../truck-appointments-contract.test.mjs      |  4 ++++
 .../truck-appointments.mjs                    |  1 +
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
index 3b581ae11..f67aaa181 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda-contract.test.mjs
@@ -6,6 +6,14 @@ import { fileURLToPath } from 'node:url'
 
 import { expandOverseasCartonCandidates, resolveCartonFixtures, run, uniqueContainerProducer } from './phase4-overseas-pda.mjs'
 
+test('receiving selects one current booking and supplies mandatory booking identity', () => {
+  assert.match(source, /id\(item.sourceContainerBookingId\) === preferredBookingId/)
+  assert.match(source, /matchingCandidates.length === 1/)
+  assert.match(source, /if \(!longId\(sourceContainerBookingId\)\)/)
+  assert.match(source, /sourceContainerBookingId=\$\{encodeURIComponent\(sourceContainerBookingId\)\}/)
+  assert.equal((source.match(/\/prepare\$\{bookingQuery\}/g) || []).length, 3)
+})
+
 test('one physical container is received once even when matrix roles overlap', () => {
   const fba = { containerNo: 'TEST-C1', fulfillmentType: 'STANDARD' }
   const overseas = { containerNo: 'TEST-C2' }
diff --git a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
index 10e9012f7..629055a77 100644
--- a/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
+++ b/scripts/admin-test-env-modules/phase4-overseas-pda.mjs
@@ -692,9 +692,10 @@ async function runReceiving(context, token, secondaryToken, merchantToken, prefe
   }
   const preferredContainer = id(preferredProducer?.containerNo)
     || context.createdResources?.phase3Loading?.containerNo
-  const candidate = preferredContainer
-    ? candidates.data.find((item) => item.containerNo === preferredContainer)
-    : candidates.data[0]
+  const preferredBookingId = id(preferredProducer?.containerBookingId)
+  const matchingCandidates = candidates.data.filter(item => item.containerNo === preferredContainer
+    && (!preferredBookingId || id(item.sourceContainerBookingId) === preferredBookingId))
+  const candidate = matchingCandidates.length === 1 ? matchingCandidates[0] : null
   if (!candidate) {
     blockerGap(context, `本轮柜号${preferredContainer || 'missing'}候选`,
       '三期装柜完成生产者已落地，但海外候选尚未出现该柜；禁止回退处理历史或其他柜', 'producer-chain', candidates.response)
@@ -705,27 +706,33 @@ async function runReceiving(context, token, secondaryToken, merchantToken, prefe
     nonBlank(containerNo) && Number(candidate?.totalPackages) > 0 && Number(candidate?.receivedPackages) >= 0,
     `containerNo=${containerNo || 'missing'}, total=${candidate?.totalPackages ?? 'missing'}; ${trace(candidates.response)}`, OPTIONS)
   if (!containerNo) return
+  const sourceContainerBookingId = id(candidate.sourceContainerBookingId)
+  if (!longId(sourceContainerBookingId)) {
+    blockerGap(context, '候选来源柜次身份', '候选未返回有效sourceContainerBookingId，不得仅按可复用柜号选柜')
+    return
+  }
+  const bookingQuery = `?sourceContainerBookingId=${encodeURIComponent(sourceContainerBookingId)}`
   context.createdResources.phase4OverseasPda.containerNo = containerNo
-  const detail = await pda(context, token, 'GET', '查询柜号完整入仓码详情', `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}`)
+  const detail = await pda(context, token, 'GET', '查询柜号完整入仓码详情', `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}${bookingQuery}`)
   if (!Array.isArray(detail.data?.inbounds) || detail.data.inbounds.length === 0) return
   const prepareBody = { idempotencyKey: key(context, 'prepare') }
   const prepared = await pda(context, token, 'POST', '选择柜号并建立WAIT_SIGN会话',
-    `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare`, prepareBody)
+    `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare${bookingQuery}`, prepareBody)
   if (!success(prepared.response)) return
   const prepareReplay = await pda(context, token, 'POST', '选择柜号同键重放',
-    `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare`, prepareBody)
+    `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare${bookingQuery}`, prepareBody)
   context.assert(MODULE, '选择柜号幂等结果一致', prepareReplay.response,
     success(prepareReplay.response) && prepareReplay.data?.containerNo === containerNo && prepareReplay.data?.status === 'WAIT_SIGN', trace(prepareReplay.response), OPTIONS)
   if (secondaryToken) {
     await expected(context, secondaryToken, 'POST', '第二仓库操作员抢占同柜返回409',
-      `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare`,
+      `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(containerNo)}/prepare${bookingQuery}`,
       { idempotencyKey: key(context, 'secondary-prepare') }, conflict)
   }
   if (runAuthorizationProbes) {
     const other = candidates.data.find((item) => item.containerNo !== containerNo
       && item.operable === true && item.allPlansReady === true && Number(item.totalPackages) > 0)
     if (other) await expected(context, token, 'GET', '当前账号跨柜切换锁返回409',
-      `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(other.containerNo)}`, undefined, conflict)
+      `/api/pda/v1/last-leg/receiving-containers/${encodeURIComponent(other.containerNo)}?sourceContainerBookingId=${encodeURIComponent(other.sourceContainerBookingId)}`, undefined, conflict)
     else blockerGap(context, '跨柜锁409', '本轮首柜作业前只有一个可收柜，无法在不伪造柜数据的前提下验证跨柜锁')
   }
   const photos = await uploadPhotos(context, token)
diff --git a/scripts/admin-test-env-modules/truck-appointments-contract.test.mjs b/scripts/admin-test-env-modules/truck-appointments-contract.test.mjs
index f7af05110..2ca2a9244 100644
--- a/scripts/admin-test-env-modules/truck-appointments-contract.test.mjs
+++ b/scripts/admin-test-env-modules/truck-appointments-contract.test.mjs
@@ -7,6 +7,10 @@ import { activeCustomerIdentity, inspectOceanBookingIdentity, minimalPdfBytes,
 
 const source = readFileSync(new URL('truck-appointments.mjs', import.meta.url), 'utf8')
 
+test('self-contained truck booking bill has its own full run namespace', () => {
+  assert.match(source, /billOfLadingNo: `BL-TRUCK-\$\{context.marker\}`/)
+})
+
 test('PDF fixtures contain actual PDF magic bytes', () => {
   const content = Buffer.from(minimalPdfBytes('TRUCK')).toString('ascii')
   assert.equal(content.slice(0, 5), '%PDF-')
diff --git a/scripts/admin-test-env-modules/truck-appointments.mjs b/scripts/admin-test-env-modules/truck-appointments.mjs
index aa551cb84..40478fa9b 100644
--- a/scripts/admin-test-env-modules/truck-appointments.mjs
+++ b/scripts/admin-test-env-modules/truck-appointments.mjs
@@ -143,6 +143,7 @@ async function fixture(context) {
   const carrier = await ensureMatsonCarrierPartner(context, MODULE, OPTIONS)
   if (!bookingAgent || !truckSupplier || !carrier?.id) return null
   const draft = oceanBookingDraft(context, suffix, master, {
+    billOfLadingNo: `BL-TRUCK-${context.marker}`.slice(0, 64),
     bookingAgentId: bookingAgent.supplierId, bookingAgentName: bookingAgent.supplierName,
     shippingCompanyId: id(carrier.id), shippingCompanyName: carrier.name, carrierCode: 'MATSON',
     containerRequirements: [{ containerType: '40HQ', containerKind: 'FCL', quantity: 2, capacityCbm: 68, maxWeightKg: 19500 }],