提交贸易合同新增计量方式

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -88,7 +88,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -5011,6 +5010,7 @@ public class KwtWaybillOrderV1Service {
         }
         TradeOrderSettlePara tradeOrderSettlePara = new TradeOrderSettlePara();
         tradeOrderSettlePara.setTOrderId(kwtLogistics.getTOrderId());
+        tradeOrderSettlePara.setLoadAmount(subtask.getLoadAmount());
         tradeOrderSettlePara.setUnloadAmount(subtask.getUnloadAmount());
         log.info("运单审核通过修改贸易订单状态请求参数：{}",JSON.toJSONString(tradeOrderSettlePara));
         tradeOrderInfoService.orderSettle(tradeOrderSettlePara);
@@ -5038,9 +5038,10 @@ public class KwtWaybillOrderV1Service {
         if (Objects.isNull(kwtLogistics)){
             throw new BusinessException("物流订单信息不存在");
         }
+        //查询贸易订单
         //调物流订单完结订单
-       // BigDecimal loadAmount  = Objects.isNull(kwtLogistics.getLoadAmount())  ? BigDecimal.ZERO: kwtLogistics.getLoadAmount();
-       // BigDecimal subLoadAmount = Objects.isNull(subtask.getLoadAmount()) ? BigDecimal.ZERO: subtask.getLoadAmount();
+        BigDecimal loadAmount  = Objects.isNull(kwtLogistics.getLoadAmount())  ? BigDecimal.ZERO: kwtLogistics.getLoadAmount();
+        BigDecimal subLoadAmount = Objects.isNull(subtask.getLoadAmount()) ? BigDecimal.ZERO: subtask.getLoadAmount();
         BigDecimal unloadAmount  = Objects.isNull(kwtLogistics.getUnloadAmount())  ? BigDecimal.ZERO: kwtLogistics.getUnloadAmount();
         BigDecimal subUnloadAmount = Objects.isNull(subtask.getUnloadAmount()) ? BigDecimal.ZERO: subtask.getUnloadAmount();
         BigDecimal entrustAmount  = Objects.isNull(kwtLogistics.getEntrustAmount())  ? BigDecimal.ZERO: kwtLogistics.getEntrustAmount();
@@ -5051,6 +5052,7 @@ public class KwtWaybillOrderV1Service {
         BigDecimal entrust = subtractAmount.compareTo(BigDecimal.ZERO) >= 0
                 ? subtractAmount : new BigDecimal("0.00");
         kwtLogisticsOrder.setEntrustAmount(entrust);
+        kwtLogisticsOrder.setTotalLoadAmount(loadAmount.add(subLoadAmount));
         kwtLogisticsOrder.setTotalUnloadAmount(unloadAmount.add(subUnloadAmount));
 
         //如果审核的状态是 完成，那么就要去查询物流订单状态是完结中，并且所有物流订单下的运单全部是完成或者取消如果是则更新状态为已完成