优化

2026-08-24 17:15:48 +08:00
parent 132d96a99b
commit 3d8a1fac20
45 changed files with 1250 additions and 35 deletions
@@ -19,7 +19,7 @@ public interface LoadingCompletedEventMapper {
               COALESCE(o.root_inbound_id, o.id) AS root_inbound_id,
               o.order_id AS source_order_id, o.order_no AS source_order_no,
               COALESCE(root_order.order_id, o.order_id) AS root_order_id,
-               o.inbound_code, o.business_type, o.destination_warehouse_id, o.destination_code AS destination_warehouse_code,
+               o.inbound_code, o.business_type, o.destination_type, o.destination_warehouse_id, o.destination_code AS destination_warehouse_code,
               o.destination_name AS destination_warehouse_name,
               i.id AS loading_plan_item_id, i.inbound_detail_id AS source_inbound_detail_id, i.sku_code,
               i.product_name_zh, i.product_name_en, i.package_count, i.product_quantity,
@@ -73,7 +73,7 @@ public interface LoadingCompletedEventMapper {
        private Integer productQuantity; private Integer palletCount; private BigDecimal grossWeightKg;
        private BigDecimal netWeightKg; private BigDecimal dimensionalWeightKg; private BigDecimal volumeCbm;
        private String fbaTrackingNo; private String shipmentNo; private String shippingMark;
-        private String businessType;
+        private String businessType; private String destinationType;
        private String customerRemark; private String internalRemark; private String warehouseRemark;
    }

@@ -103,13 +103,15 @@ public class LoadingCompletedOutboxService {
            first.getDestinationWarehouseCode(), first.getDestinationWarehouseName(), sumInt(sorted, Row::getPackageCount),
            sumNullableInt(sorted, Row::getProductQuantity), "ONE_CLICK_DROPSHIP".equals(orderType)
                ? pallets.size() : 0, sum(sorted, Row::getGrossWeightKg), sum(sorted, Row::getNetWeightKg),
-            sum(sorted, Row::getVolumeCbm), items, string(first.getAccountId()), orderType, pallets);
+            sum(sorted, Row::getVolumeCbm), items, string(first.getAccountId()), orderType, pallets,
+            destinationType(sorted));
    }

    /** 国内按实装箱数从可用标签池稳定随机抽取箱唛，重复发布同一计划时结果不变。 */
    private Map<Long, List<String>> cartonLabelPools(List<Row> rows) {
        Map<Long, List<String>> result = new java.util.LinkedHashMap<>();
        Map<LabelPoolKey, List<Row>> byInbound = rows.stream().filter(row -> !dropship(row.getBusinessType()))
+            .filter(row -> "OVERSEAS".equals(destinationType(List.of(row))))
            .collect(java.util.stream.Collectors.groupingBy(
                row -> new LabelPoolKey(row.getAccountId(), row.getSourceInboundId()),
                LinkedHashMap::new, java.util.stream.Collectors.toList()));
@@ -155,6 +157,17 @@ public class LoadingCompletedOutboxService {
        return result;
    }

+    private String destinationType(List<Row> rows) {
+        Set<String> values = rows.stream().map(Row::getDestinationType)
+            .map(value -> value == null ? "" : value.trim().toUpperCase(java.util.Locale.ROOT))
+            .collect(java.util.stream.Collectors.toSet());
+        if (values.size() != 1 || (!values.contains("FBA") && !values.contains("OVERSEAS"))) {
+            throw new BizException(ResultCode.CONFLICT,
+                "装柜入仓单目的类型必须唯一且为 FBA 或 OVERSEAS，不能生成海外交接事件");
+        }
+        return values.iterator().next();
+    }
+
    private record LabelPoolKey(long accountId, long inboundId) { }

    private List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> palletSnapshots(List<Row> values, List<PalletRow> source) {