1、4.2物流托运委托量调整；

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -6,7 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.AddressDefaultTypeEnum;
+import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
@@ -184,7 +184,7 @@ public class KwmAddressService {
             }
 
             if (Objects.nonNull(item.getDefaultType())) {
-                addressQueryResVo.setDefaultTypeName(AddressDefaultTypeEnum.getName(item.getDefaultType()).getName());
+                addressQueryResVo.setDefaultTypeName(AddressTypeEnum.getName(item.getDefaultType()).getName());
             }
 
             if (Objects.nonNull(entCacheResDto)) {
@@ -218,24 +218,24 @@ public class KwmAddressService {
         Integer setDefaultType = reqVo.getDefaultType();
 
         //当前是收货或者卸货
-        if (!defaultType.equals(AddressDefaultTypeEnum.NO.getCode()) && !defaultType.equals(AddressDefaultTypeEnum.BOTH.getCode())) {
+        if (!defaultType.equals(AddressTypeEnum.NO.getCode()) && !defaultType.equals(AddressTypeEnum.BOTH.getCode())) {
             if (defaultType.equals(setDefaultType)) {
                 //相等则取消
-                kwmAddress.setDefaultType(AddressDefaultTypeEnum.NO.getCode());
+                kwmAddress.setDefaultType(AddressTypeEnum.NO.getCode());
             } else {
-                kwmAddress.setDefaultType(AddressDefaultTypeEnum.BOTH.getCode());
+                kwmAddress.setDefaultType(AddressTypeEnum.BOTH.getCode());
             }
 
         }
 
         //当前是收货也是卸货
-        if (defaultType.equals(AddressDefaultTypeEnum.BOTH.getCode())) {
-            if (setDefaultType.equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
-                kwmAddress.setDefaultType(AddressDefaultTypeEnum.TAKE.getCode());
+        if (defaultType.equals(AddressTypeEnum.BOTH.getCode())) {
+            if (setDefaultType.equals(AddressTypeEnum.SHIPMENT.getCode())) {
+                kwmAddress.setDefaultType(AddressTypeEnum.TAKE.getCode());
             }
 
-            if (setDefaultType.equals(AddressDefaultTypeEnum.TAKE.getCode())) {
-                kwmAddress.setDefaultType(AddressDefaultTypeEnum.SHIPMENT.getCode());
+            if (setDefaultType.equals(AddressTypeEnum.TAKE.getCode())) {
+                kwmAddress.setDefaultType(AddressTypeEnum.SHIPMENT.getCode());
             }
         }
 
@@ -244,20 +244,20 @@ public class KwmAddressService {
         lambdaQueryWrapper.eq(KwmAddress::getEntId, entId).
                 eq(KwmAddress::getDelFlag, Global.NO).
                 and(wp -> wp.eq(KwmAddress::getDefaultType, setDefaultType).or().
-                        eq(KwmAddress::getDefaultType, AddressDefaultTypeEnum.BOTH.getCode()));
+                        eq(KwmAddress::getDefaultType, AddressTypeEnum.BOTH.getCode()));
         List<KwmAddress> kwmAddressList = kwmAddressMapper.selectList(lambdaQueryWrapper);
         if (CollectionUtils.isNotEmpty(kwmAddressList)) {
             KwmAddress kwmAddress1 = kwmAddressList.get(0);
-            if (kwmAddress1.getDefaultType().equals(AddressDefaultTypeEnum.BOTH.getCode())) {
-                if (setDefaultType.equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
-                    kwmAddress1.setDefaultType(AddressDefaultTypeEnum.TAKE.getCode());
+            if (kwmAddress1.getDefaultType().equals(AddressTypeEnum.BOTH.getCode())) {
+                if (setDefaultType.equals(AddressTypeEnum.SHIPMENT.getCode())) {
+                    kwmAddress1.setDefaultType(AddressTypeEnum.TAKE.getCode());
                 }
 
-                if (setDefaultType.equals(AddressDefaultTypeEnum.TAKE.getCode())) {
-                    kwmAddress1.setDefaultType(AddressDefaultTypeEnum.SHIPMENT.getCode());
+                if (setDefaultType.equals(AddressTypeEnum.TAKE.getCode())) {
+                    kwmAddress1.setDefaultType(AddressTypeEnum.SHIPMENT.getCode());
                 }
             } else {
-                kwmAddress1.setDefaultType(AddressDefaultTypeEnum.NO.getCode());
+                kwmAddress1.setDefaultType(AddressTypeEnum.NO.getCode());
             }
             kwmAddress1.setUpdateBy(userId);
             kwmAddress1.setUpdateTime(date);
@@ -266,7 +266,7 @@ public class KwmAddressService {
             }
         }
 
-        if (defaultType.equals(AddressDefaultTypeEnum.NO.getCode())) {
+        if (defaultType.equals(AddressTypeEnum.NO.getCode())) {
             kwmAddress.setDefaultType(setDefaultType);
         }
 
@@ -321,7 +321,7 @@ public class KwmAddressService {
         kwmAddress.setUpdateBy(userId);
         kwmAddress.setCreateTime(date);
         kwmAddress.setUpdateTime(date);
-        kwmAddress.setDefaultType(AddressDefaultTypeEnum.NO.getCode());
+        kwmAddress.setDefaultType(AddressTypeEnum.NO.getCode());
         kwmAddress.setId(new IdWorker(1L).nextId());
         if (kwmAddressMapper.insert(kwmAddress) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/Import/KwtAcceptCarriageOrderImportService.java

@@ -564,17 +564,17 @@ public class KwtAcceptCarriageOrderImportService {
      */
     private void insertOrderAddress(List<EntAddressResDto> addressRes, Long lOrderId, String loadAddressName, String unloadAddressName) {
         Map<Integer, List<EntAddressResDto>> collect = addressRes.stream().collect(Collectors.groupingBy(EntAddressResDto::getDefaultType));
-        List<EntAddressResDto> loadAddressRes = collect.get(AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<EntAddressResDto> loadAddressRes = collect.get(AddressTypeEnum.SHIPMENT.getCode());
         Map<String, EntAddressResDto> loadAddressMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(loadAddressRes)) {
             loadAddressMap = loadAddressRes.stream().collect(Collectors.toMap(EntAddressResDto::getName, v -> v));
         }
-        List<EntAddressResDto> unloadAddressRes = collect.get(AddressDefaultTypeEnum.TAKE.getCode());
+        List<EntAddressResDto> unloadAddressRes = collect.get(AddressTypeEnum.TAKE.getCode());
         Map<String, EntAddressResDto> unloadAddressMap = new HashMap<>();
         if (CollectionUtils.isNotEmpty(unloadAddressRes)) {
             unloadAddressMap = unloadAddressRes.stream().collect(Collectors.toMap(EntAddressResDto::getName, v -> v));
         }
-        List<EntAddressResDto> allAddressRes = collect.get(AddressDefaultTypeEnum.BOTH.getCode());
+        List<EntAddressResDto> allAddressRes = collect.get(AddressTypeEnum.BOTH.getCode());
         Map<String, EntAddressResDto> allAddressResMap = new HashMap<>();
 
         if (CollectionUtils.isNotEmpty(allAddressRes)) {
@@ -958,17 +958,17 @@ public class KwtAcceptCarriageOrderImportService {
         Map<Integer, List<EntAddressResDto>> collect = addressRes.stream().collect(Collectors.groupingBy(EntAddressResDto::getDefaultType));
         List<String> loadAddress = new ArrayList<>();
         List<String> unloadAddress = new ArrayList<>();
-        List<EntAddressResDto> loadAddressRes = collect.get(AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<EntAddressResDto> loadAddressRes = collect.get(AddressTypeEnum.SHIPMENT.getCode());
         if (CollectionUtils.isNotEmpty(loadAddressRes)) {
             List<String> loadAddressStr = loadAddressRes.stream().map(EntAddressResDto::getName).collect(Collectors.toList());
             loadAddress.addAll(loadAddressStr);
         }
-        List<EntAddressResDto> unloadAddressRes = collect.get(AddressDefaultTypeEnum.TAKE.getCode());
+        List<EntAddressResDto> unloadAddressRes = collect.get(AddressTypeEnum.TAKE.getCode());
         if (CollectionUtils.isNotEmpty(unloadAddressRes)) {
             List<String> unloadAddressStr = unloadAddressRes.stream().map(EntAddressResDto::getName).collect(Collectors.toList());
             unloadAddress.addAll(unloadAddressStr);
         }
-        List<EntAddressResDto> allAddressRes = collect.get(AddressDefaultTypeEnum.BOTH.getCode());
+        List<EntAddressResDto> allAddressRes = collect.get(AddressTypeEnum.BOTH.getCode());
         if (CollectionUtils.isNotEmpty(allAddressRes)) {
             List<String> allAddress = allAddressRes.stream().map(EntAddressResDto::getName).collect(Collectors.toList());
             loadAddress.addAll(allAddress);

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

@@ -12,10 +12,7 @@ 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.CooperateTypeEnum;
-import com.sckw.core.model.enums.LogisticsOrderEnum;
-import com.sckw.core.model.enums.OrderRuleEnum;
-import com.sckw.core.model.enums.RedisOrderGenerateEnum;
+import com.sckw.core.model.enums.*;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.OrderGenerateSeqNoUtils;
@@ -163,28 +160,32 @@ public class KwtLogisticsOrderConsignmentService {
         if (!dto.getIsFullDose()) {
             //BigDecimal amount = tradeOrder.getAmount().subtract(tradeOrder.getEntrustAmount());
             BigDecimal amount = dto.getCarryingCapacity();
-            if (amount.compareTo(NumberConstant.ZERO_TWO) == 0) {
+            if (dto.getCarryingCapacity() == null || amount.doubleValue() <= 0) {
                 log.error("可分配量分配错误:{}", dto.getTOrderId());
                 throw new BusinessException("可分配量分配必须填写大于0");
             }
             //可运量校验
-            boolean bool = logisticsOrderGoodsService.chenkLogisticsAmount(dto, tradeOrder);
-            if (!bool) {
+            if (!logisticsOrderGoodsService.chenkLogisticsAmount(dto, tradeOrder)) {
                 log.error("可分配量分配错误:{}", dto.getTOrderId());
                 throw new BusinessException("可分配量分配错误");
             }
-            if (ArrayUtil.isEmpty(dto.getCarryingCapacity())) {
-                throw new BusinessException("不是全量分配时,分配量不能为空!");
-            }
             order.setAmount(dto.getCarryingCapacity());
+
         } else {
-            order.setAmount(NumberConstant.ZERO_TWO);
+            order.setAmount(dto.getCarryingCapacity());
             order.setSubcontractAmount(NumberConstant.ZERO_TWO);
         }
+        //地址分配量校验
+        if (!checkCarryingCapacity(dto)) {
+            log.error("地址分配量与总委派量不一致");
+            throw new BusinessException("地址分配量与总委派量不一致");
+        }
+
         /**验证结算方式*/
         checkBillingMode(dto);
+
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
-        order.setId(orderId);
+        order.setId(new IdWorker(NumberConstant.ONE).nextId());
         //List<ContractDto> contractInfo = dto.getContractInfo();
         long contractId = dto.getContractId();
         List<Long> contractList = new ArrayList<>();
@@ -248,6 +249,25 @@ public class KwtLogisticsOrderConsignmentService {
         pushConsoleMessage(dto, lOrderNo);
     }
 
+    /**
+     * @param dto 参数
+     * @desc 校验地址分配量与总委托量是否一致
+     * @author zk
+     * @date 2024/4/2
+     **/
+    private boolean checkCarryingCapacity(LogisticsConsignmentDto dto) {
+        //地址信息
+        List<AddressInfoDto> addressInfo = dto.getAddressInfo();
+        //装货地址-委派量
+        BigDecimal loadAmount = addressInfo.stream().map(s -> s.getAddressType() == AddressTypeEnum.SHIPMENT.getCode()
+                ? s.getAmount() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //卸货地址-委派量
+        BigDecimal unloadAmount = addressInfo.stream().map(s -> s.getAddressType() == AddressTypeEnum.TAKE.getCode()
+                ? s.getAmount() : BigDecimal.ZERO).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //总委派量
+        BigDecimal carryingCapacity = dto.getCarryingCapacity();
+        return loadAmount.doubleValue() == carryingCapacity.doubleValue() && unloadAmount.doubleValue() == carryingCapacity.doubleValue();
+    }
 
     private boolean checkBillingMode(LogisticsConsignmentDto dto) {
         if ("4".equals(dto.getBillingMode())) {

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

@@ -500,7 +500,7 @@ public class KwtWaybillOrderService {
                     //计划装卸货时间
                     Date planTime = sendCarEntrust.getPlanTime();
                     //装货+卸货
-                    if (sendCarEntrust.getAddressType() == AddressDefaultTypeEnum.SHIPMENT.getCode()) {
+                    if (sendCarEntrust.getAddressType() == AddressTypeEnum.SHIPMENT.getCode()) {
                         if (entrustAmount.get(lOrderId) == null) {
                             entrustAmount.put(lOrderId, amount);
                             loadTime.put(lOrderId, new ArrayList<>() {{
@@ -665,7 +665,7 @@ public class KwtWaybillOrderService {
             //物流订单地址委托量信息-装货信息
             KwtLogisticsOrderAddress queryAmount = new KwtLogisticsOrderAddress();
             queryAmount.setLOrderId(lOrderId);
-            queryAmount.setAddressType(AddressDefaultTypeEnum.SHIPMENT.getCode());
+            queryAmount.setAddressType(AddressTypeEnum.SHIPMENT.getCode());
             List<KwtLogisticsOrderAmount> logisticsOrderAmounts = logisticsOrderAmountDao.findByAddress(queryAmount);
             for (KwtLogisticsOrderAmount orderAmount : logisticsOrderAmounts) {
                 BigDecimal truckEntrustAmount = truckTotalEntrustAmount.get(orderAmount.getLAddressId());

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.constant.NumberConstant;
-import com.sckw.core.model.enums.AddressDefaultTypeEnum;
+import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.IdWorker;
@@ -266,7 +266,7 @@ public class KwtWaybillOrderTicketService {
         for (KwtLogisticsOrderGoodsUnit goodsUnit:goodsUnits) {
             WaybillTicketVO waybillTicket = new WaybillTicketVO();
             //装货榜单信息
-            List<KwtWaybillOrderTicket> loadTickets = ticketMapper.findWaybillOrderTicketV1(subtask.getWOrderId(), subtask.getId(), AddressDefaultTypeEnum.SHIPMENT.getCode(), goodsUnit.getUnit());
+            List<KwtWaybillOrderTicket> loadTickets = ticketMapper.findWaybillOrderTicketV1(subtask.getWOrderId(), subtask.getId(), AddressTypeEnum.SHIPMENT.getCode(), goodsUnit.getUnit());
             //装货时间
             Optional<KwtWaybillOrderTicket> unloadDate = loadTickets.stream().max(Comparator.comparing(KwtWaybillOrderTicket::getOperateTime));
             //装货地点榜单
@@ -275,7 +275,7 @@ public class KwtWaybillOrderTicketService {
             //装货量
             BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
             //卸货榜单信息
-            List<KwtWaybillOrderTicket> unloadTickets = ticketMapper.findWaybillOrderTicketV1(subtask.getWOrderId(), subtask.getId(), AddressDefaultTypeEnum.TAKE.getCode(), goodsUnit.getUnit());
+            List<KwtWaybillOrderTicket> unloadTickets = ticketMapper.findWaybillOrderTicketV1(subtask.getWOrderId(), subtask.getId(), AddressTypeEnum.TAKE.getCode(), goodsUnit.getUnit());
             //卸货时间
             Optional<KwtWaybillOrderTicket> loadDate = unloadTickets.stream().min(Comparator.comparing(KwtWaybillOrderTicket::getOperateTime));
             //卸货地点榜单

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

@@ -508,9 +508,9 @@ public class KwtWaybillOrderV1Service {
         //子运单
         List<KwtWaybillOrderSubtask> subtasks = waybillOrderSubtaskDao.findByWOrderId(waybillOrder.getWOrderId());
         //子运单
-        List<KwtWaybillOrderAddress> loadAddresses = waybillOrderAddressDao.findByAddresses(waybillOrder.getWOrderId(), AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<KwtWaybillOrderAddress> loadAddresses = waybillOrderAddressDao.findByAddresses(waybillOrder.getWOrderId(), AddressTypeEnum.SHIPMENT.getCode());
         //子运单
-        List<KwtWaybillOrderAddress> unloadAddresses = waybillOrderAddressDao.findByAddresses(waybillOrder.getWOrderId(), AddressDefaultTypeEnum.TAKE.getCode());
+        List<KwtWaybillOrderAddress> unloadAddresses = waybillOrderAddressDao.findByAddresses(waybillOrder.getWOrderId(), AddressTypeEnum.TAKE.getCode());
         //装货时间
         Optional<KwtWaybillOrderSubtask> unloadDate = subtasks.stream().max(Comparator.comparing(KwtWaybillOrderSubtask::getUnloadTime));
         //卸货时间
@@ -586,7 +586,7 @@ public class KwtWaybillOrderV1Service {
         //数据处理
         List<String> loadUrl = new ArrayList<>(), unloadUrl = new ArrayList<>();
         for (KwtWaybillOrderTicket ticket:tickets) {
-            if(ticket.getType().equals(AddressDefaultTypeEnum.SHIPMENT.getCode())){
+            if(ticket.getType().equals(AddressTypeEnum.SHIPMENT.getCode())){
                 loadUrl.add(FileUtils.spliceBatch(ticket.getUrls()));
             } else {
                 unloadUrl.add(FileUtils.spliceBatch(ticket.getUrls()));
@@ -633,7 +633,7 @@ public class KwtWaybillOrderV1Service {
         //运单地址状态处理(到达装货点、已装货、到达卸货点、已卸货)
         List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findByAddresses(wOrderId, null);
         for (KwtWaybillOrderAddress address:addresses) {
-            if (address.getAddressType().equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
+            if (address.getAddressType().equals(AddressTypeEnum.SHIPMENT.getCode())) {
                 statusList = new ArrayList<>(){{add(CarWaybillEnum.WAIT_LOADING.getCode()); add(CarWaybillEnum.COMPLETION_LOADING.getCode());}};
             } else {
                 statusList = new ArrayList<>(){{add(CarWaybillEnum.WAIT_UNLOADING.getCode()); add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());}};
@@ -877,7 +877,7 @@ public class KwtWaybillOrderV1Service {
             //物流订单地址委托量信息-装货信息
             KwtLogisticsOrderAddress queryAmount = new KwtLogisticsOrderAddress();
             queryAmount.setLOrderId(lOrderId);
-            queryAmount.setAddressType(AddressDefaultTypeEnum.SHIPMENT.getCode());
+            queryAmount.setAddressType(AddressTypeEnum.SHIPMENT.getCode());
             List<KwtLogisticsOrderAmount> logisticsOrderAmounts = logisticsOrderAmountDao.findByAddress(queryAmount);
             for (KwtLogisticsOrderAmount orderAmount:logisticsOrderAmounts) {
                 BigDecimal truckEntrustAmount = truckTotalEntrustAmount.get(orderAmount.getLAddressId());
@@ -944,7 +944,7 @@ public class KwtWaybillOrderV1Service {
                         //计划装卸货时间
                         Date planTime = sendCarEntrust.getPlanTime();
                         //装货+卸货
-                        if (sendCarEntrust.getAddressType() == AddressDefaultTypeEnum.SHIPMENT.getCode()) {
+                        if (sendCarEntrust.getAddressType() == AddressTypeEnum.SHIPMENT.getCode()) {
                             entrustAmount = entrustAmount.add(amount);
                             loadTime.add(planTime);
                         } else {
@@ -986,7 +986,7 @@ public class KwtWaybillOrderV1Service {
             //委派量
             BigDecimal amount = BigDecimal.valueOf(sendCarEntrust.getEntrustAmount());
             //装货+卸货
-            if (sendCarEntrust.getAddressType() == AddressDefaultTypeEnum.SHIPMENT.getCode()) {
+            if (sendCarEntrust.getAddressType() == AddressTypeEnum.SHIPMENT.getCode()) {
                 if (lEntrustAmount.get(sendCarEntrust.getLOrderId()) == null) {
                     lEntrustAmount.put(sendCarEntrust.getLOrderId(), amount);
                 } else {
@@ -1174,7 +1174,7 @@ public class KwtWaybillOrderV1Service {
             /*4、回退物流订单委托量*/
             /*4.1、装货址委派量entrustAmount回退*/
             //运单装货地址
-            List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressDefaultTypeEnum.SHIPMENT.getCode());
+            List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
             for (KwtWaybillOrderAddress address:orderAddresses) {
                 //物流订单-装卸货地址运量信息
                 KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
@@ -1251,7 +1251,7 @@ public class KwtWaybillOrderV1Service {
         /*6、累加物流订单委托量(循环运单)*/
         /*6.1、装货址委派量entrustAmount累加*/
         //运单装货地址
-        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
         for (KwtWaybillOrderAddress address:orderAddresses) {
             //物流订单-装卸货地址运量信息
             KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
@@ -1316,7 +1316,7 @@ public class KwtWaybillOrderV1Service {
         /*5、回退物流订单委托量(循环运单)*/
         /*5.1、装货址委派量entrustAmount回退*/
         //运单装货地址
-        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
         for (KwtWaybillOrderAddress address:orderAddresses) {
             //物流订单-装卸货地址运量信息
             KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
@@ -1444,7 +1444,7 @@ public class KwtWaybillOrderV1Service {
         /*5、回退物流订单委托量*/
         /*5.1、装货址委派量entrustAmount回退*/
         //运单装货地址
-        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressDao.findByAddresses(wOrderId, AddressTypeEnum.SHIPMENT.getCode());
         for (KwtWaybillOrderAddress address:orderAddresses) {
             //物流订单-装卸货地址运量信息
             KwtLogisticsOrderAmount logisticsOrderAmount = logisticsOrderAmountDao.findByLAddressId(address.getLAddressId());
@@ -1784,9 +1784,9 @@ public class KwtWaybillOrderV1Service {
         //物流运单信息
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
         //运单-子单装货榜单信息
-        List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
+        List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
         //运单-子单卸货榜单信息
-        List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
+        List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
         //装货-总量
         BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
         //卸货-总量
@@ -1890,9 +1890,9 @@ public class KwtWaybillOrderV1Service {
             //物流运单信息
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
             //运单-子单装货榜单信息
-            List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
+            List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
             //运单-子单卸货榜单信息
-            List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
+            List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
             //装货-总量
             BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
             //卸货-总量
@@ -2104,9 +2104,9 @@ public class KwtWaybillOrderV1Service {
             //物流运单信息
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
             //运单-子单装货榜单信息
-            List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
+            List<KwtWaybillOrderTicket> loadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.SHIPMENT.getCode(), orderSubtask.getUnit());
             //运单-子单卸货榜单信息
-            List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressDefaultTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
+            List<KwtWaybillOrderTicket> unloadTickets = waybillOrderTicketDao.findWaybillOrderTicketV1(wOrderId, ticket.getWSubtaskId(), AddressTypeEnum.TAKE.getCode(), orderSubtask.getUnit());
             //装货-总量
             BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
             //卸货-总量
@@ -2167,7 +2167,7 @@ public class KwtWaybillOrderV1Service {
                 queryParams.put("lAddressId", amount.getLAddressId());
                 queryParams.put("passStatus", Global.NUMERICAL_ONE);
                 WaybillCountVo waybillCount = waybillOrderV1Dao.findTicketCountByAddress(queryParams);
-                if (address.getAddressType().equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
+                if (address.getAddressType().equals(AddressTypeEnum.SHIPMENT.getCode())) {
                     //计算单个地址需要回退委派量
                     BigDecimal countEntrustAmount = countEntrustAmount(subtask, amount.getLAddressId());
                     amount.setEntrustAmount(amount.getEntrustAmount().subtract(countEntrustAmount));
@@ -2195,7 +2195,7 @@ public class KwtWaybillOrderV1Service {
      * @date 2024/3/7
      **/
     public BigDecimal countEntrustAmount(KwtWaybillOrderSubtask subtask, Long lAddressId){
-        List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findBySubtaskId(subtask.getId(), AddressDefaultTypeEnum.SHIPMENT.getCode());
+        List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findBySubtaskId(subtask.getId(), AddressTypeEnum.SHIPMENT.getCode());
         //运单地址进行统计
         Map<String, Object> queryParams = new HashMap<>(NumberConstant.SIXTEEN);
         queryParams.put("wOrderId", subtask.getWOrderId());
@@ -2245,7 +2245,7 @@ public class KwtWaybillOrderV1Service {
             queryParams.put("unit", logisticsOrder.getUnit());
             queryParams.put("passStatus", Global.NUMERICAL_ONE);
             WaybillCountVo waybillCount1 = waybillOrderV1Dao.findTicketCountByAddress(queryParams);
-            if (address.getAddressType().equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
+            if (address.getAddressType().equals(AddressTypeEnum.SHIPMENT.getCode())) {
                 amount.setTotalLoadAmount(waybillCount1.getAmount());
             } else {
                 amount.setTotalUnloadAmount(waybillCount1.getAmount());
@@ -2297,7 +2297,7 @@ public class KwtWaybillOrderV1Service {
 
         /*数据处理*/
         List<Map<String, Object>> addressList = new ArrayList<>();
-        List<Integer> typeList = new ArrayList<>(){{add(AddressDefaultTypeEnum.SHIPMENT.getCode()); add(AddressDefaultTypeEnum.TAKE.getCode());}};
+        List<Integer> typeList = new ArrayList<>(){{add(AddressTypeEnum.SHIPMENT.getCode()); add(AddressTypeEnum.TAKE.getCode());}};
         for (Integer type:typeList) {
             //装货地址
             List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findByAddresses(wOrderId, type);
@@ -2469,7 +2469,7 @@ public class KwtWaybillOrderV1Service {
         //运单状态处理(到达装货点、已装货、到达卸货点、已卸货)
         List<KwtWaybillOrderAddress> addresses = waybillOrderAddressDao.findByAddresses(wOrderId, null);
         for (KwtWaybillOrderAddress address:addresses) {
-            if (address.getAddressType().equals(AddressDefaultTypeEnum.SHIPMENT.getCode())) {
+            if (address.getAddressType().equals(AddressTypeEnum.SHIPMENT.getCode())) {
                 statusList = new ArrayList<>(){{add(CarWaybillEnum.WAIT_LOADING.getCode()); add(CarWaybillEnum.COMPLETION_LOADING.getCode());}};
             } else {
                 statusList = new ArrayList<>(){{add(CarWaybillEnum.WAIT_UNLOADING.getCode()); add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());}};