fix: complete order measurement downstream flow

2026-09-18 14:58:40 +08:00
parent 02d2474141
commit c8a99f9fff
43 changed files with 621 additions and 52 deletions
@@ -22,6 +22,8 @@ public record InboundPlanListResponse(
    String customerName,
    Integer packageCount,
    Integer pickedPackageCount,
+    BigDecimal grossWeightKg,
+    BigDecimal netWeightKg,
    BigDecimal volumeCbm,
    Integer palletCount,
    boolean assigned,
@@ -39,7 +41,8 @@ public record InboundPlanListResponse(
    public InboundPlanListResponse withReceivingWarehouse(String warehouseCode, String warehouseName) {
        return new InboundPlanListResponse(lineId, planId, planNo, customerId, orderId, inboundCode, lxCode,
            orderType, overseasWarehouseId, warehouseCode, warehouseName, warehouseId, this.warehouseCode,
-            this.warehouseName, fbaWarehouseCode, customerName, packageCount, pickedPackageCount, volumeCbm,
+            this.warehouseName, fbaWarehouseCode, customerName, packageCount, pickedPackageCount,
+            grossWeightKg, netWeightKg, volumeCbm,
            palletCount, assigned, mergeAllowed, urgent, status, appointmentNo, appointmentStatus, appointmentAt,
            expectedLoadingAt, dispatchStatus, createdAt, version);
    }
@@ -19,6 +19,8 @@ public record InboundPlanResponse(
    String status,
    int lineCount,
    int palletCount,
+    BigDecimal totalGrossWeightKg,
+    BigDecimal totalNetWeightKg,
    BigDecimal totalVolumeCbm,
    int expectedPackageCount,
    int pickedPackageCount,
@@ -38,7 +40,8 @@ public record InboundPlanResponse(
 ) {
    public record Line(Long id, Long orderId, String inboundCode, String fbaWarehouseCode, String destinationWarehouseId,
                       String destinationWarehouseCode, String destinationWarehouseName,
-                       BigDecimal volumeCbm, int requiredPackageCount, int plannedPalletCount) {
+                       BigDecimal grossWeightKg, BigDecimal netWeightKg, BigDecimal volumeCbm,
+                       int requiredPackageCount, int plannedPalletCount) {
    }

    public record Pallet(Long id, String palletNo, String destinationWarehouseId,
@@ -17,6 +17,8 @@ public interface InboundPlanOrderMapper {
    record ReceivingWarehouseSnapshot(String overseasWarehouseId, String overseasWarehouseCode,
                                      String overseasWarehouseName) { }
    record DetailOrderSnapshot(String orderNo, String customerName, String orderType) { }
+    record OrderWeightSnapshot(Long orderId, java.math.BigDecimal grossWeightKg,
+                               java.math.BigDecimal netWeightKg) { }
    record ContainerWarehouseRef(String customerId, Long orderId, String sourceContainerBookingId,
                                 String overseasWarehouseId) { }
    record ContainerPreviewOrderRow(
@@ -116,6 +118,17 @@ public interface InboundPlanOrderMapper {
    DetailOrderSnapshot findDetailOrder(@Param("customerId") String customerId,
                                        @Param("orderId") Long orderId);

+    @Select("<script>SELECT o.id AS orderId," +
+        "COALESCE(SUM(d.gross_weight_kg),MAX(i.gross_weight_kg),0) AS grossWeightKg," +
+        "COALESCE(SUM(d.net_weight_kg),MAX(i.net_weight_kg),0) AS netWeightKg " +
+        "FROM ll_order o LEFT JOIN ll_order_detail d ON d.order_id=o.id AND d.customer_id=o.customer_id " +
+        "LEFT JOIN ll_inbound_order i ON i.id=o.id AND i.customer_id=o.customer_id " +
+        "WHERE o.customer_id=#{customerId} AND o.id IN " +
+        "<foreach collection='orderIds' item='id' open='(' separator=',' close=')'>#{id}</foreach> " +
+        "GROUP BY o.id</script>")
+    List<OrderWeightSnapshot> findOrderWeights(@Param("customerId") String customerId,
+                                                @Param("orderIds") List<Long> orderIds);
+
    @Update("UPDATE ll_order SET inbound_order_no=#{planNo},current_status='INBOUND_PLANNED'," +
        "pallet_merge_flag='MERGED',pallet_count=#{palletCount},updated_at=#{updatedAt} " +
        "WHERE customer_id=#{customerId} AND id=#{orderId}")
@@ -43,6 +43,10 @@ public interface InboundPlanQueryMapper {
        "l.destination_warehouse_name warehouseName,l.fba_warehouse_code fbaWarehouseCode," +
        "o.customer_name customerName,l.required_package_count packageCount," +
        "COALESCE((SELECT SUM(pa.picked_package_count) FROM ll_inbound_plan_pallet_allocation pa WHERE pa.line_id=l.id),0) pickedPackageCount," +
+        "COALESCE((SELECT SUM(d.gross_weight_kg) FROM ll_order_detail d WHERE d.order_id=l.order_id AND d.customer_id=p.customer_id)," +
+        "(SELECT i.gross_weight_kg FROM ll_inbound_order i WHERE i.id=l.order_id AND i.customer_id=p.customer_id),0) grossWeightKg," +
+        "COALESCE((SELECT SUM(d.net_weight_kg) FROM ll_order_detail d WHERE d.order_id=l.order_id AND d.customer_id=p.customer_id)," +
+        "(SELECT i.net_weight_kg FROM ll_inbound_order i WHERE i.id=l.order_id AND i.customer_id=p.customer_id),0) netWeightKg," +
        "l.volume_cbm volumeCbm," +
        "l.planned_pallet_count palletCount,p.assigned_flag assigned,p.merge_required mergeAllowed," +
        "p.urgent_flag urgent,p.status status,a.appointment_no appointmentNo," +
@@ -1077,6 +1077,16 @@ public class InboundPlanService {
        }
        List<InboundPlanLine> lines = lineMapper.selectList(new LambdaQueryWrapper<InboundPlanLine>()
            .eq(InboundPlanLine::getPlanId, plan.getId()).orderByAsc(InboundPlanLine::getId));
+        Map<Long, InboundPlanOrderMapper.OrderWeightSnapshot> weights = lines.isEmpty() ? Map.of()
+            : orderMapper.findOrderWeights(plan.getCustomerId(), lines.stream().map(InboundPlanLine::getOrderId)
+                .filter(Objects::nonNull).distinct().toList()).stream()
+                .collect(Collectors.toMap(InboundPlanOrderMapper.OrderWeightSnapshot::orderId, value -> value));
+        BigDecimal totalGrossWeightKg = weights.values().stream()
+            .map(InboundPlanOrderMapper.OrderWeightSnapshot::grossWeightKg).filter(Objects::nonNull)
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal totalNetWeightKg = weights.values().stream()
+            .map(InboundPlanOrderMapper.OrderWeightSnapshot::netWeightKg).filter(Objects::nonNull)
+            .reduce(BigDecimal.ZERO, BigDecimal::add);
        List<InboundPlanPallet> pallets = palletMapper.selectList(new LambdaQueryWrapper<InboundPlanPallet>()
            .eq(InboundPlanPallet::getPlanId, plan.getId()).orderByAsc(InboundPlanPallet::getSequenceNo));
        List<InboundPlanPalletAllocation> allocations = allocationMapper.selectList(
@@ -1116,11 +1126,14 @@ public class InboundPlanService {
            sourceOrder == null ? null : sourceOrder.customerName(),
            sourceOrder == null ? null : sourceOrder.orderType(), plan.getContainerNo(),
            authoritativeWarehouse.warehouseCode(), authoritativeWarehouse.warehouseName(),
-            plan.getStatus(), plan.getLineCount(), plan.getPalletCount(), plan.getTotalVolumeCbm(),
+            plan.getStatus(), plan.getLineCount(), plan.getPalletCount(), totalGrossWeightKg,
+            totalNetWeightKg, plan.getTotalVolumeCbm(),
            lines.stream().mapToInt(InboundPlanLine::getRequiredPackageCount).sum(),
            allocations.stream().mapToInt(InboundPlanPalletAllocation::getPickedPackageCount).sum(),
            lines.stream().map(line -> new InboundPlanResponse.Line(line.getId(), line.getOrderId(), line.getInboundCode(), line.getFbaWarehouseCode(),
                line.getDestinationWarehouseId(), line.getDestinationWarehouseCode(), line.getDestinationWarehouseName(),
+                weights.containsKey(line.getOrderId()) ? weights.get(line.getOrderId()).grossWeightKg() : BigDecimal.ZERO,
+                weights.containsKey(line.getOrderId()) ? weights.get(line.getOrderId()).netWeightKg() : BigDecimal.ZERO,
                line.getVolumeCbm(), line.getRequiredPackageCount(), line.getPlannedPalletCount())).toList(),
            pallets.stream().map(pallet -> new InboundPlanResponse.Pallet(pallet.getId(), pallet.getPalletNo(),
                pallet.getDestinationWarehouseId(), pallet.getDestinationWarehouseCode(), pallet.getDestinationWarehouseName(),