优化

firstleg/src/main/java/com/baiyue/firstleg/service/CartonMeasurementService.java

@@ -124,12 +124,21 @@ public class CartonMeasurementService {
         if (!repository.updateItem(item)) {
             throw concurrentModification();
         }
-        recalculateMeasurement(measurement, repository.listItems(tenantId, measurement.getId()));
+        List<InboundMeasurementItemEntity> items = repository.listItems(tenantId, measurement.getId());
+        recalculateMeasurement(measurement, items);
         if (!repository.updateMeasurement(measurement)) {
             throw concurrentModification();
         }
         // 提交审核后仍允许平台人工修正代表箱数，但订单原始总箱数不可被测量汇总覆盖。
         if ("MEASURE_PENDING".equals(inbound.getProcessStatus())) {
+            BigDecimal totalWeight = items.stream()
+                .map(InboundMeasurementItemEntity::getTotalWeightKg)
+                .filter(java.util.Objects::nonNull)
+                .reduce(BigDecimal.ZERO, BigDecimal::add)
+                .setScale(3, RoundingMode.CEILING);
+            if (positive(totalWeight)) {
+                inbound.setActualGrossWeightKg(totalWeight);
+            }
             inbound.setActualVolumeCbm(measurement.getTotalVolumeCbm());
             inbound.setVolumeWeightKg(measurement.getVolumeWeightKg());
             if (!repository.updateInbound(inbound)) {

firstleg/src/test/java/com/baiyue/firstleg/service/CartonMeasurementServiceTest.java

@@ -230,13 +230,19 @@ class CartonMeasurementServiceTest {
     }
 
     @Test
-    void confirmedPackageCountCanBeCorrectedAfterSubmissionWithoutChangingOriginalPackageCount() {
+    void confirmedPackageCountSynchronizesActualWeightAndVolumeForPricingAfterSubmission() {
         InboundOrderEntity inbound = inbound("MEASURE_PENDING");
         InboundMeasurementEntity measurement = measurement(30001L, "SUBMITTED", 2);
         measurement.setTotalPackageCount(1);
         measurement.setTotalVolumeCbm(new BigDecimal("0.0600"));
         measurement.setVolumeWeightKg(new BigDecimal("10.020"));
         InboundMeasurementItemEntity item = item(40001L, 30001L, 1, 99001L);
+        item.setUnitWeightKg(new BigDecimal("10.880"));
+        item.setOuterLengthCm(new BigDecimal("50"));
+        item.setOuterWidthCm(new BigDecimal("40"));
+        item.setOuterHeightCm(new BigDecimal("30"));
+        item.setUnitVolumeCbm(new BigDecimal("0.1496"));
+        item.setCalculationRuleVersion("ACTUAL_DIMENSION_V1");
         when(repository.findInbound(10001L, 70001L)).thenReturn(inbound);
         when(repository.findItem(10001L, 40001L)).thenReturn(item);
         when(repository.findMeasurement(10001L, 70001L, 30001L)).thenReturn(measurement);
@@ -248,8 +254,9 @@ class CartonMeasurementServiceTest {
         service.updateConfirmedPackageCount(10001L, 70001L, 40001L, 2, 5);
 
         assertThat(inbound.getTotalPackageCount()).isEqualTo(5);
-        assertThat(inbound.getActualVolumeCbm()).isEqualByComparingTo("0.5250");
-        assertThat(inbound.getVolumeWeightKg()).isEqualByComparingTo("87.675");
+        assertThat(inbound.getActualGrossWeightKg()).isEqualByComparingTo("54.400");
+        assertThat(inbound.getActualVolumeCbm()).isEqualByComparingTo("0.7480");
+        assertThat(inbound.getVolumeWeightKg()).isEqualByComparingTo("124.916");
         verify(repository).updateInbound(inbound);
     }