提交新增合同文件校验

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

@@ -21,11 +21,26 @@ public class WaybillOrderDetailResp implements Serializable {
      */
     @Schema(description = "运单id")
     private String waybillOrderId;
+    /**
+     * 运单编号
+     */
+    @Schema(description = "运单编号")
+    private String waybillOrderNo;
     /**
      * 物流订单号
      */
     @Schema(description = "物流订单号")
     private String logisticOrderNo;
+    /**
+     * 计费方式
+     */
+    @Schema(description = "计费方式")
+    private String priceType;
+    /**
+     * 计费方式描述
+     */
+    @Schema(description = "计费方式描述")
+    private String priceTypeDesc;
     /**
      * 车牌号
      */

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

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -3286,10 +3287,6 @@ public class KwtWaybillOrderV1Service {
         if (Objects.isNull(logOrder)){
             throw new BusinessException("物流信息不存在");
         }
-        //查询车队
-        Long fleetId = Objects.nonNull(truck) && org.apache.commons.lang3.StringUtils.isNotBlank(truck.getFleetId()) ?
-                Long.parseLong(truck.getFleetId()) : null;
-
 
         RFleetVo fleet = null;
         try {
@@ -3327,7 +3324,10 @@ public class KwtWaybillOrderV1Service {
                                                                      KwpGoods kwpGoods ) {
         WaybillOrderDetailResp waybillOrderDetailResp = new WaybillOrderDetailResp();
         waybillOrderDetailResp.setWaybillOrderId(String.valueOf(billOrder.getId()));
+        waybillOrderDetailResp.setWaybillOrderNo(billOrder.getWOrderNo());
         waybillOrderDetailResp.setLogisticOrderNo(logOrder.getLOrderNo());
+        waybillOrderDetailResp.setPriceType(String.valueOf(logOrder.getBillingMode()));
+        waybillOrderDetailResp.setPriceTypeDesc(DictEnum.getLabel(DictTypeEnum.CHARGING_TYPE.getType(),logOrder.getBillingMode()));
         waybillOrderDetailResp.setTruckNo(billOrder.getTruckNo());
         waybillOrderDetailResp.setCarAxis(Objects.nonNull(truck) ? truck.getCarAxis() : "");
         waybillOrderDetailResp.setFleetName(Optional.ofNullable(fleet).map(RFleetVo::getName).orElse( ""));