入库修改

2026-08-20 13:34:34 +08:00
parent 3b19a1bc16
commit b139255d3b
24 changed files with 528 additions and 62 deletions
@@ -0,0 +1,21 @@
+package com.baiyue.firstleg.mapper;
+
+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 LoadingCartonManifestMapper {
+    @Select("""
+        SELECT box_code FROM fl_inbound_carton_label
+         WHERE tenant_id=#{tenantId} AND inbound_id=#{inboundId} AND inbound_detail_id=#{inboundDetailId}
+           AND batch_status='ACTIVE'
+         ORDER BY carton_index,id
+        """)
+    List<String> labelPool(@Param("tenantId") long tenantId, @Param("inboundId") long inboundId,
+                           @Param("inboundDetailId") long inboundDetailId);
+
+}
@@ -21,7 +21,7 @@ public interface LoadingCompletedEventMapper {
               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.destination_name AS destination_warehouse_name,
-               i.inbound_detail_id AS source_inbound_detail_id, i.sku_code,
+               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,
               i.pallet_count, i.gross_weight_kg, i.net_weight_kg, i.dimensional_weight_kg,
               i.volume_cbm, i.fba_tracking_no, i.shipment_no, i.shipping_mark
@@ -65,6 +65,7 @@ public interface LoadingCompletedEventMapper {
        private Integer aggregateVersion; private String containerNo; private String cabinetNo;
        private Long warehouseId; private String warehouseName; private Long accountId;
        private Long sourceInboundId; private Long rootInboundId; private Long sourceOrderId;
+        private Long loadingPlanItemId;
        private String sourceOrderNo; private Long rootOrderId; private String inboundCode;
        private Long destinationWarehouseId; private String destinationWarehouseCode;
        private String destinationWarehouseName; private Long sourceInboundDetailId; private String skuCode;
@@ -15,6 +15,7 @@ import com.baiyue.firstleg.mapper.InboundOutboxMapper;
 import com.baiyue.firstleg.mapper.LoadingCompletedEventMapper;
 import com.baiyue.firstleg.mapper.LoadingCompletedEventMapper.Row;
 import com.baiyue.firstleg.mapper.LoadingCompletedEventMapper.PalletRow;
+import com.baiyue.firstleg.mapper.LoadingCartonManifestMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -37,26 +38,29 @@ import java.util.Objects;
 public class LoadingCompletedOutboxService {
    private static final long HANDOVER_VERSION = 2L;
    @Resource private LoadingCompletedEventMapper snapshotMapper;
+    @Resource private LoadingCartonManifestMapper cartonManifestMapper;
    @Resource private InboundOutboxMapper outboxMapper;
    @Resource private ObjectMapper objectMapper;

    public void publish(long planId) {
        List<Row> rows = snapshotMapper.rows(planId);
        if (rows.isEmpty()) throw new BizException(ResultCode.CONFLICT, "装柜计划没有最终实装入仓单，不能生成尾程交接事件");
+        Map<Long, List<String>> cartonMarks = cartonLabelPools(rows);
        List<PalletRow> palletRows = snapshotMapper.palletRows(planId);
        rows.stream().collect(java.util.stream.Collectors.groupingBy(Row::getAccountId,
            java.util.TreeMap::new, java.util.stream.Collectors.toList()))
            .forEach((accountId, accountRows) -> insert(envelope(accountId, accountRows,
-                palletRows.stream().filter(item -> accountId.equals(item.getAccountId())).toList())));
+                palletRows.stream().filter(item -> accountId.equals(item.getAccountId())).toList(), cartonMarks)));
    }

-    private EventEnvelope envelope(long accountId, List<Row> rows, List<PalletRow> palletRows) {
+    private EventEnvelope envelope(long accountId, List<Row> rows, List<PalletRow> palletRows,
+                                   Map<Long, List<String>> cartonMarks) {
        Row first = rows.get(0);
        Map<Long, List<Row>> byInbound = rows.stream().collect(java.util.stream.Collectors.groupingBy(
            Row::getSourceInboundId, java.util.TreeMap::new, java.util.stream.Collectors.toList()));
        List<FirstLegLoadingPlanCompletedV2.Order> orders = byInbound.values().stream()
            .map(value -> order(value, palletRows.stream()
-                .filter(item -> Objects.equals(item.getSourceInboundId(), value.get(0).getSourceInboundId())).toList())).toList();
+                .filter(item -> Objects.equals(item.getSourceInboundId(), value.get(0).getSourceInboundId())).toList(), cartonMarks)).toList();
        var payload = new FirstLegLoadingPlanCompletedV2(String.valueOf(first.getLoadingPlanId()),
            first.getPlanNo(), string(first.getContainerBookingId()), first.getContainerNo(), first.getCabinetNo(),
            string(first.getWarehouseId()), first.getWarehouseName(), orders);
@@ -70,7 +74,8 @@ public class LoadingCompletedOutboxService {
            traceId, eventKey, null, payloadNode, hash).requireValid();
    }

-    private FirstLegLoadingPlanCompletedV2.Order order(List<Row> values, List<PalletRow> palletRows) {
+    private FirstLegLoadingPlanCompletedV2.Order order(List<Row> values, List<PalletRow> palletRows,
+                                                       Map<Long, List<String>> cartonMarks) {
        List<Row> sorted = values.stream().sorted(Comparator.comparing(Row::getSourceInboundDetailId)).toList();
        Row first = sorted.get(0);
        List<FirstLegLoadingPlanCompletedV2.Item> items = sorted.stream().map(row ->
@@ -79,7 +84,8 @@ public class LoadingCompletedOutboxService {
                row.getPalletCount(), row.getGrossWeightKg(), row.getNetWeightKg(), row.getDimensionalWeightKg(),
                row.getVolumeCbm(), string(row.getDestinationWarehouseId()), row.getDestinationWarehouseCode(),
                row.getDestinationWarehouseName(), row.getFbaTrackingNo(), row.getShipmentNo(), row.getShippingMark(),
-                row.getCustomerRemark(), row.getInternalRemark(), row.getWarehouseRemark()))
+                row.getCustomerRemark(), row.getInternalRemark(), row.getWarehouseRemark(), null,
+                cartonMarks.getOrDefault(row.getLoadingPlanItemId(), List.of())))
            .toList();
        String orderType = dropship(first.getBusinessType()) ? "ONE_CLICK_DROPSHIP" : "FIRST_LEG";
        List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> pallets = dropship(first.getBusinessType())
@@ -96,6 +102,21 @@ public class LoadingCompletedOutboxService {
            sum(sorted, Row::getVolumeCbm), items, string(first.getAccountId()), orderType, pallets);
    }

+    /**
+     * 国内只确认本柜实装箱数，不扫每张箱唛。事件携带全量可用标签池，海外首扫才确权具体箱唛。
+     */
+    private Map<Long, List<String>> cartonLabelPools(List<Row> rows) {
+        Map<Long, List<String>> result = new java.util.LinkedHashMap<>();
+        for (Row row : rows) {
+            if (dropship(row.getBusinessType())) continue;
+            List<String> labels = Objects.requireNonNullElse(cartonManifestMapper.labelPool(row.getAccountId(),
+                row.getSourceInboundId(), row.getSourceInboundDetailId()), List.of());
+            if (labels.isEmpty()) throw new BizException(ResultCode.CONFLICT, "装柜明细没有已打印的可用箱唛池，不能生成海外交接事件");
+            result.put(row.getLoadingPlanItemId(), labels);
+        }
+        return result;
+    }
+
    private List<FirstLegLoadingPlanCompletedV2.PalletSnapshot> palletSnapshots(List<Row> values, List<PalletRow> source) {
        if (source.isEmpty()) return List.of();
        Map<String, List<PalletRow>> byPallet = source.stream().collect(java.util.stream.Collectors.groupingBy(