优化

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

@@ -10,6 +10,7 @@ import com.baiyue.firstleg.dto.CartonMeasurementResult;
 import com.baiyue.firstleg.entity.InboundMeasurementEntity;
 import com.baiyue.firstleg.entity.InboundMeasurementItemEntity;
 import com.baiyue.firstleg.entity.InboundOrderEntity;
+import com.baiyue.firstleg.entity.InboundWeightResultEntity;
 import com.baiyue.firstleg.repository.InboundMeasurementRepository;
 import feign.FeignException;
 import org.slf4j.Logger;
@@ -143,13 +144,26 @@ public class CartonMeasurementService {
         }
         // 提交审核后仍允许平台人工修正代表箱数，但订单原始总箱数不可被测量汇总覆盖。
         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);
+            List<InboundWeightResultEntity> confirmedWeights = repository.listWeights(tenantId, inboundId)
+                .stream()
+                .filter(weight -> "CONFIRMED".equals(weight.getRecognitionStatus()))
+                .toList();
+            if (!confirmedWeights.isEmpty()) {
+                BigDecimal confirmedNetWeight = confirmedWeights.stream()
+                    .map(InboundWeightResultEntity::getNetWeightKg)
+                    .filter(java.util.Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add)
+                    .setScale(3, RoundingMode.CEILING);
+                inbound.setActualGrossWeightKg(confirmedNetWeight);
+            } else {
+                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());