Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java

@@ -60,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -797,8 +798,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setUnloadNet(BigDecimal.ZERO);
 
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
-
-        details.forEach(item->{
+        details.stream().filter(item->!Objects.equals(item.getChildNo(), settlementOwnerDetail.getChildNo()))
+                .collect(Collectors.toList())
+                .forEach(item->{
             settlementOwner.setWeight(settlementOwner.getWeight().add(item.getWeight()));
             settlementOwner.setFreight(settlementOwner.getFreight().add(item.getFreight()));
             settlementOwner.setLossWeight(settlementOwner.getLossWeight().add(item.getLossWeight()));