|
|
@@ -3,10 +3,10 @@ package com.sckw.transport.service;
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
-import com.sckw.core.model.constant.NumberConstant;
|
|
|
import com.sckw.core.common.enums.enums.DictTypeEnum;
|
|
|
import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
|
+import com.sckw.core.model.constant.NumberConstant;
|
|
|
import com.sckw.core.model.enums.*;
|
|
|
import com.sckw.core.model.page.PageResult;
|
|
|
import com.sckw.core.utils.*;
|
|
|
@@ -21,7 +21,6 @@ import com.sckw.mongo.enums.BusinessTypeEnum;
|
|
|
import com.sckw.mongo.model.SckwLogisticsOrder;
|
|
|
import com.sckw.mongo.model.SckwWaybillOrder;
|
|
|
import com.sckw.order.api.dubbo.TradeOrderInfoService;
|
|
|
-import com.sckw.order.api.model.CompleteLogisticsOrderParam;
|
|
|
import com.sckw.redis.constant.RedisConstant;
|
|
|
import com.sckw.redis.utils.RedissonUtils;
|
|
|
import com.sckw.stream.enums.MessageEnum;
|
|
|
@@ -47,10 +46,10 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.atomic.AtomicReference;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -2514,7 +2513,7 @@ public class KwtWaybillOrderService {
|
|
|
int status = params.getStatus() == Global.NO ? CarWaybillEnum.APPROVAL_PASS.getCode() : CarWaybillEnum.APPROVAL_NO_PASS.getCode();
|
|
|
//装卸货信息
|
|
|
List<WaybillOrderTicketLoadingDto> load = params.getLoad();
|
|
|
- List<WaybillOrderTicketLoadingDto> unload = params.getLoad();
|
|
|
+ List<WaybillOrderTicketLoadingDto> unload = params.getUnload();
|
|
|
waybillOrder.setLoadAmount(waybillOrderTicketService.countAmount(load, waybillOrder.getUnit(), waybillOrder.getLoadAmount()));
|
|
|
waybillOrder.setUnloadAmount(waybillOrderTicketService.countAmount(unload, waybillOrder.getUnit(), waybillOrder.getUnloadAmount()));
|
|
|
waybillOrder.setDeficitAmount(waybillOrder.getLoadAmount().subtract(waybillOrder.getUnloadAmount()));
|
lengfaqiang