贴标申请，仓储转运

2026-09-20 15:06:17 +08:00
parent a7d458cddd
commit 02844da360
56 changed files with 2121 additions and 111 deletions
@@ -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");