1.计算单位修改

2.订单详情  已履约量按照车次进行处理

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderTicket.java

@@ -3,6 +3,7 @@ package com.sckw.transport.model;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -85,7 +86,6 @@ public class KwtWaybillOrderTicket implements Serializable {
      * 创建人更新人
      */
     private Long updateBy;
-
     /**
      * 更新时间
      */
@@ -95,6 +95,7 @@ public class KwtWaybillOrderTicket implements Serializable {
      * 是否删除（0未删除，1删除）
      */
     @TableLogic("0")
+//    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer delFlag;
 
     private static final long serialVersionUID = 1L;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CarWaybillVO.java

@@ -117,6 +117,16 @@ public class CarWaybillVO {
      */
     private String lossLabel;
 
+    /**
+     * unit
+     */
+    private String unit;
+
+    /**
+     * unit
+     */
+    private String unitLabel;
+
     /**
      * 派车人
      */

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

@@ -348,6 +348,8 @@ public class KwtConsignOrderService {
         }
         List<CarWaybillVO> returnList = new ArrayList<>();
         list = list.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
+        /**计量单位*/
+        Map<String, String> unitDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
         for (String id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
                             .eq(StringUtils.isNotBlank(id), KwtLogisticsOrder::getId, Long.parseLong(id))
@@ -367,12 +369,12 @@ public class KwtConsignOrderService {
                     KwtWaybillOrderTicket loadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
                             .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE)
-                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                            .eq(KwtWaybillOrderTicket::getUnit, kwtWaybillOrder.getUnit())
                     );
                     KwtWaybillOrderTicket unloadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
                             .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO)
-                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                            .eq(KwtWaybillOrderTicket::getUnit, kwtWaybillOrder.getUnit())
                     );
                     //合理损耗
                     BigDecimal loss = order.getLoss() == null ? NumberConstant.ZERO_TWO : order.getLoss();
@@ -400,6 +402,9 @@ public class KwtConsignOrderService {
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
                     carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
+                    carWaybillVo.setUnit(kwtWaybillOrder.getUnit());
+                    carWaybillVo.setUnitLabel(kwtWaybillOrder.getUnit() == null ? null :
+                            (unitDictData == null ? kwtWaybillOrder.getUnit() : unitDictData.get(kwtWaybillOrder.getUnit())));
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/
@@ -627,6 +632,8 @@ public class KwtConsignOrderService {
 //                .in(KwtLogisticsOrder::getId,list)
 //                .orderByDesc(KwtLogisticsOrder::getId)
 //        );
+        /**计量单位*/
+        Map<String, String> unitDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**趟次数据*/
         for (Long id : list) {
             KwtLogisticsOrder order = kwtLogisticsOrderMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrder>()
@@ -648,12 +655,12 @@ public class KwtConsignOrderService {
                     KwtWaybillOrderTicket loadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
                             .eq(KwtWaybillOrderTicket::getType, NumberConstant.ONE)
-                            .eq(KwtWaybillOrderTicket::getUnit, "0")
+                            .eq(KwtWaybillOrderTicket::getUnit, kwtWaybillOrder.getUnit())
                     );
                     KwtWaybillOrderTicket unloadTicket = kwtWaybillOrderTicketMapper.selectOne(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
                             .eq(StringUtils.isNotBlank(kwtWaybillOrder.getId()), KwtWaybillOrderTicket::getWOrderId, kwtWaybillOrder.getId())
                             .eq(KwtWaybillOrderTicket::getType, NumberConstant.TWO)
-                            .eq(KwtWaybillOrderTicket::getUnit,"0")
+                            .eq(KwtWaybillOrderTicket::getUnit, kwtWaybillOrder.getUnit())
                     );
                     //合理损耗
                     BigDecimal loss = order.getLoss() == null ? NumberConstant.ZERO_TWO : order.getLoss();
@@ -680,6 +687,9 @@ public class KwtConsignOrderService {
                     carWaybillVo.setWaybillType(kwtWaybillOrder.getType());
                     carWaybillVo.setDriverName(kwtWaybillOrder.getDriverName());
                     carWaybillVo.setDriverPhone(kwtWaybillOrder.getDriverPhone());
+                    carWaybillVo.setUnit(kwtWaybillOrder.getUnit());
+                    carWaybillVo.setUnitLabel(kwtWaybillOrder.getUnit() == null ? null :
+                            (unitDictData == null ? kwtWaybillOrder.getUnit() : unitDictData.get(kwtWaybillOrder.getUnit())));
                     //todo 取mongo
 //                SckwWaybillOrder sckwWaybillOrder = mongoTemplate.findById(kwtWaybillOrder.getId(), SckwWaybillOrder.class);
                     /** 2023-07-24 原值为承运车队-去除后更换展示为承运公司*/
@@ -954,7 +964,7 @@ public class KwtConsignOrderService {
                     HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, true);
 //                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
-                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
+                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), logisticsOrder.getTOrderId(), goodsLoading);
                     if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                         log.info("托运订单手动完结订单-完结订单,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 托运订单手动完结订单-完结订单!" + result1.getMsg());
@@ -1270,7 +1280,7 @@ public class KwtConsignOrderService {
      * @return
      */
     public HttpResult consignOrderFinishDetail(String orderId) {
-        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN){{
+        Map<String, Object> map = new HashMap<>(NumberConstant.SIXTEEN) {{
             put("upperlOrderId", orderId);
             put("passStatus", Global.NUMERICAL_ONE);
         }};
@@ -1285,7 +1295,7 @@ public class KwtConsignOrderService {
         //物流订单辅助单位信息
         List<KwtLogisticsOrderGoodsUnit> goodsUnits = logisticsOrderGoodsService.findGoodsUnit(logisticsOrder.getId());
         if (CollectionUtils.isNotEmpty(goodsUnits)) {
-            goodsUnits.forEach(e ->{
+            goodsUnits.forEach(e -> {
                 assistUnit.add(new OrderGoodsLoadingVo(e.getUnit(), unitMap != null ? unitMap.get(e.getUnit()) : null, e.getTotalLoadAmount(), e.getTotalUnloadAmount()));
             });
         }

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

@@ -233,10 +233,13 @@ public class KwtTransportCommonService {
         }
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());
         orderDetailVO.setScheduleEndTime(logisticsOrder.getEndTime() == null ? null : logisticsOrder.getEndTime());
+        /**2023-12-23 新增车次按照卸货量计费*/
         if (logisticsOrder.getBillingMode().equals(String.valueOf(NumberConstant.ONE))) {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getTotalLoadAmount() == null ? null : logisticsOrder.getTotalLoadAmount());
         } else if (logisticsOrder.getBillingMode().equals(String.valueOf(NumberConstant.TWO))) {
             orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
+        }else {
+            orderDetailVO.setPerformanceAmount(logisticsOrder.getUnloadAmount() == null ? null : logisticsOrder.getUnloadAmount());
         }
 //        orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : logisticsOrder.getLoadAmount());
         orderDetailVO.setTotalLoadAmount(logisticsOrder.getTotalLoadAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getTotalLoadAmount());