Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into test

2026-10-09 17:36:25 +08:00
parent 261cdc87cb 7e37770f26
commit d11abb78ac
5 changed files with 83 additions and 16 deletions
@@ -9,6 +9,10 @@ import java.util.List;

@Mapper
 public interface ReturnOrderMapper extends BaseMapper<ReturnOrder> {
+    @Select("SELECT * FROM ll_return_order WHERE customer_id=#{customerId} AND lastleg_order_id=#{tailOrderId} LIMIT 1 FOR UPDATE")
+    ReturnOrder lockTailOrder(@Param("customerId") String customerId, @Param("tailOrderId") long tailOrderId);
+    @Select("SELECT o.* FROM ll_return_order o WHERE o.id=(SELECT r.return_order_id FROM ll_return_receipt r WHERE r.receipt_no=#{receiptNo} LIMIT 1) FOR UPDATE")
+    ReturnOrder lockReceiptOrder(@Param("receiptNo") String receiptNo);
    @Select("SELECT * FROM ll_return_order WHERE customer_id=#{customerId} AND overseas_warehouse_id=#{warehouseId} AND status='COMPLETED' ORDER BY created_at,id")
    List<ReturnOrder> completedCustomer(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId);
    @Select("SELECT * FROM ll_return_order WHERE customer_id=#{customerId} AND idempotency_key=#{key} LIMIT 1")
@@ -19,6 +19,8 @@ import java.util.*;
@Service
 public class ReturnCartonCountService {
    @Resource private ReturnReceiptMapper receipts;
+    @Resource private ReturnOrderMapper orders;
+    @Resource private ReturnReceiptService returnReceiptService;
    @Resource private ReturnReceiptItemMapper receiptItems;
    @Resource private ReturnInventoryCartonMapper cartons;
    @Resource private ReturnInventoryCartonItemMapper items;
@@ -100,6 +102,7 @@ public class ReturnCartonCountService {
    @Transactional
    public Task confirm(PdaWarehouseIdentity identity, String receiptNo, Confirm request) {
        var session = lockSession(identity);
+        orders.lockReceiptOrder(receiptNo);
        ReturnReceipt receipt = receipts.lockCountReceipt(receiptNo);
        if (receipt == null) throw error(HttpStatus.NOT_FOUND, "托盘签收任务不存在");
        List<ReturnInventoryCarton> boxes = cartons.lockReceipt(receipt.getId());
@@ -148,6 +151,11 @@ public class ReturnCartonCountService {
            long delta = newCounts.getOrDefault(sku, 0L) - oldCounts.getOrDefault(sku, 0L);
            if (delta != 0 && balances.adjustCartonQuantity(receipt.getCustomerId(), boxes.get(0).getOverseasWarehouseId(), sku, delta) != 1) throw error(HttpStatus.CONFLICT, "SKU 箱数余额已变化，请重新核对");
        }
+        for (ReturnReceiptItem line : receiptItems.listReceipt(receipt.getId())) {
+            line.setBoxCount(newCounts.getOrDefault(line.getSkuCode(), 0L));
+            receiptItems.updateById(line);
+        }
+        returnReceiptService.refreshCountedTailCargo(receipt);
        if (sessions.release(identity.operatorKey(), receipt.getId()) != 1) throw error(HttpStatus.CONFLICT, "清点会话已变化，请重新核对");
        Task result = task(receipt, boxes);
        ReturnInventoryOperation operation = new ReturnInventoryOperation(); operation.setId(IdWorker.getId()); operation.setOperatorId(identity.operatorKey());
@@ -201,15 +201,11 @@ public class ReturnReceiptService {
            result.getSize(), result.getTotal(), result.getPages());
    }

-    /** Backfill tail-leg cargo for receipts created before tail synchronization was added. */
+    /** Reconcile legacy forecast totals and receipt details without adding the facts twice. */
    @Transactional
    public void ensureTailCargo(String customerId, long tailOrderId) {
        if (lastlegOrderDetails == null) return;
-        long existing = lastlegOrderDetails.selectCount(new LambdaQueryWrapper<LastlegOrderDetail>()
-            .eq(LastlegOrderDetail::getCustomerId, customerId).eq(LastlegOrderDetail::getOrderId, tailOrderId));
-        if (existing > 0) return;
-        ReturnOrder order = orders.selectOne(new LambdaQueryWrapper<ReturnOrder>()
-            .eq(ReturnOrder::getCustomerId, customerId).eq(ReturnOrder::getLastlegOrderId, tailOrderId));
+        ReturnOrder order = orders.lockTailOrder(customerId, tailOrderId);
        if (order == null) return;
        Map<String, ReturnOrderItem> bySku = orderItems.listOrder(order.getId()).stream()
            .collect(java.util.stream.Collectors.toMap(ReturnOrderItem::getSkuCode, value -> value, (left, right) -> left, LinkedHashMap::new));
@@ -665,10 +661,25 @@ public class ReturnReceiptService {
    }

    /** Keep the platform tail-leg order detail in sync with PDA receipt facts. */
+    @Transactional
+    public void refreshCountedTailCargo(ReturnReceipt receipt) {
+        ReturnOrder order = orders.selectById(receipt.getReturnOrderId());
+        if (order == null) return;
+        Map<String, ReturnOrderItem> bySku = orderItems.listOrder(order.getId()).stream()
+            .collect(java.util.stream.Collectors.toMap(ReturnOrderItem::getSkuCode, item -> item));
+        List<Allocation> allocations = receiptItems.listReceipt(receipt.getId()).stream()
+            .map(line -> new Allocation(bySku.get(line.getSkuCode()), value(line.getReceivedQuantity())))
+            .filter(line -> line.item() != null).toList();
+        syncTailCargo(order, receipt, allocations, LocalDateTime.now());
+    }
+
    private void syncTailCargo(ReturnOrder order, ReturnReceipt receipt, List<Allocation> allocations, LocalDateTime now) {
        if (lastlegOrderDetails == null || order.getLastlegOrderId() == null) return;
        LastlegOrder tail = lastlegOrders.selectById(order.getLastlegOrderId());
        if (tail == null || !Objects.equals(order.getCustomerId(), tail.getCustomerId())) return;
+        lastlegOrderDetails.delete(new LambdaQueryWrapper<LastlegOrderDetail>()
+            .eq(LastlegOrderDetail::getCustomerId, order.getCustomerId()).eq(LastlegOrderDetail::getOrderId, tail.getId())
+            .likeRight(LastlegOrderDetail::getSourceInboundDetailId, "RETURN_ORDER:"));
        Map<String, Long> quantities = new LinkedHashMap<>();
        Map<String, Long> boxes = new LinkedHashMap<>();
        Map<String, String> names = new LinkedHashMap<>();
@@ -680,31 +691,40 @@ public class ReturnReceiptService {
        for (ReturnReceiptItem line : receiptItems.listReceipt(receipt.getId())) {
            boxes.merge(line.getSkuCode(), value(line.getBoxCount()), Math::addExact);
        }
-        int packageCount = 0;
        boolean firstSku = true;
        for (Map.Entry<String, Long> entry : quantities.entrySet()) {
            int skuBoxes = Math.toIntExact("PARCEL".equals(receipt.getUnitType()) ? 1 : boxes.getOrDefault(entry.getKey(), 0L));
            if (skuBoxes <= 0) skuBoxes = 1;
-            LastlegOrderDetail detail = new LastlegOrderDetail();
-            detail.setId(IdWorker.getId()); detail.setCustomerId(order.getCustomerId()); detail.setOrderId(tail.getId());
-            detail.setSourceInboundDetailId("RETURN_RECEIPT:" + receipt.getId() + ":" + entry.getKey());
+            String sourceKey = "RETURN_RECEIPT:" + receipt.getId() + ":" + entry.getKey();
+            LastlegOrderDetail detail = lastlegOrderDetails.selectOne(new LambdaQueryWrapper<LastlegOrderDetail>()
+                .eq(LastlegOrderDetail::getCustomerId, order.getCustomerId()).eq(LastlegOrderDetail::getOrderId, tail.getId())
+                .eq(LastlegOrderDetail::getSourceInboundDetailId, sourceKey).last("LIMIT 1"));
+            boolean newDetail = detail == null;
+            if (newDetail) { detail = new LastlegOrderDetail(); detail.setId(IdWorker.getId()); }
+            detail.setCustomerId(order.getCustomerId()); detail.setOrderId(tail.getId());
+            detail.setSourceInboundDetailId(sourceKey);
            detail.setSkuCode(entry.getKey()); detail.setProductNameZh(names.get(entry.getKey())); detail.setPackageCount(skuBoxes);
            detail.setProductQuantity(Math.toIntExact(entry.getValue())); detail.setPalletCount("PALLET".equals(receipt.getUnitType()) ? 1 : 0);
            detail.setGrossWeightKg(firstSku ? receipt.getWeight() : null); detail.setVolumeCbm(firstSku && receipt.getLength() != null && receipt.getWidth() != null && receipt.getHeight() != null
                ? receipt.getLength().multiply(receipt.getWidth()).multiply(receipt.getHeight()).divide(java.math.BigDecimal.valueOf(1_000_000)) : null);
            detail.setShippingMark(receipt.getCartonMark());
-            lastlegOrderDetails.insert(detail);
-            packageCount = Math.addExact(packageCount, skuBoxes);
+            if (newDetail) lastlegOrderDetails.insert(detail); else lastlegOrderDetails.updateById(detail);
            firstSku = false;
        }
-        tail.setPackageCount(Math.addExact(tail.getPackageCount() == null ? 0 : tail.getPackageCount(), packageCount));
-        tail.setReceivedPackageCount(Math.addExact(tail.getReceivedPackageCount() == null ? 0 : tail.getReceivedPackageCount(), packageCount));
-        tail.setProductQuantity(Math.addExact(tail.getProductQuantity() == null ? 0 : tail.getProductQuantity(), Math.toIntExact(allocations.stream().mapToLong(Allocation::quantity).sum())));
-        if ("PALLET".equals(receipt.getUnitType())) tail.setPalletCount(Math.addExact(tail.getPalletCount() == null ? 0 : tail.getPalletCount(), 1));
        // Recalculate from physical carriers; signing another pallet must not overwrite the first pallet's volume.
        Map<String, ReturnReceipt> measuredUnits = new LinkedHashMap<>();
        List<ReturnReceipt> signedReceipts = new ArrayList<>(receipts.listOrder(order.getId()));
        if (signedReceipts.stream().noneMatch(line -> Objects.equals(line.getId(), receipt.getId()))) signedReceipts.add(0, receipt);
+        int actualBoxes = 0, actualUnits = 0;
+        Set<String> palletCodes = new LinkedHashSet<>();
+        for (ReturnReceipt signed : signedReceipts) {
+            actualBoxes = Math.addExact(actualBoxes, "PARCEL".equals(signed.getUnitType()) ? 1 : Math.toIntExact(value(signed.getTotalBoxCount())));
+            actualUnits = Math.addExact(actualUnits, Math.toIntExact(receiptItems.listReceipt(signed.getId()).stream()
+                .mapToLong(line -> value(line.getReceivedQuantity())).sum()));
+            if ("PALLET".equals(signed.getUnitType())) palletCodes.add(text(signed.getUnitCode()) == null ? signed.getReceiptNo() : signed.getUnitCode());
+        }
+        tail.setPackageCount(actualBoxes); tail.setReceivedPackageCount(actualBoxes);
+        tail.setProductQuantity(actualUnits); tail.setPalletCount(palletCodes.size());
        for (ReturnReceipt signed : signedReceipts) {
            if (signed.getLength() == null || signed.getWidth() == null || signed.getHeight() == null || "PARCEL".equals(signed.getUnitType())) continue;
            String code = text(signed.getUnitCode()) == null ? signed.getReceiptNo() : signed.getUnitCode();