1、4.2数据库变更调整提交；

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwtWaybillOrderController.java

@@ -149,6 +149,20 @@ public class KwtWaybillOrderController {
         return waybillOrderService.sendCar(params);
     }
 
+    /**
+     * @param params {}
+     * @desc 派车-趟次/循环
+     * @author zk
+     * @date 2023/5/30
+     **/
+    @PostMapping("/sendCarV1")
+    public HttpResult sendCarV1(@RequestBody @Valid ValiList<SendCarDto1> params){
+        if (CollectionUtils.isEmpty(params)) {
+            return HttpResult.error("请选择委派车辆信息！");
+        }
+        return waybillOrderService.sendCar(params);
+    }
+
     /**
      * @param ids 车辆运单主键ID，多个已逗号隔开
      * @desc 取消派车

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderAmountMapper.java

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwtLogisticsOrderAmount;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zk
+ * @desc 物流订单-装卸货地址运量信息
+ * @date 2024/3/1 0001
+ */
+@Mapper
+public interface KwtLogisticsOrderAmountMapper extends BaseMapper<KwtLogisticsOrderAmount> {
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderLineFreightRateMapper.java

@@ -0,0 +1,14 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwtLogisticsOrderLineFreightRate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zk
+ * @desc 物流订单-线路运价信息
+ * @date 2024/3/1 0001
+ */
+@Mapper
+public interface KwtLogisticsOrderLineFreightRateMapper extends BaseMapper<KwtLogisticsOrderLineFreightRate> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderSubtaskMapper.java

@@ -0,0 +1,14 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwtWaybillOrderSubtask;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zk
+ * @desc 车辆运单-子运单
+ * @date 2024/3/1 0001
+ */
+@Mapper
+public interface KwtWaybillOrderSubtaskMapper extends BaseMapper<KwtWaybillOrderSubtask> {
+}

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

@@ -85,6 +85,11 @@ public class KwtLogisticsOrderAddress implements Serializable {
      */
     private Integer entryType;
 
+    /**
+     * 排序（升序）
+     */
+    private Integer sort;
+
     /**
      * 备注
      */

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

@@ -0,0 +1,76 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @author zk
+ * @desc 物流订单-装卸货地址运量信息
+ * @date 2024/3/1 0001
+ */
+@Data
+@TableName("kwt_logistics_order_amount")
+public class KwtLogisticsOrderAmount extends BaseModel {
+
+    /**
+     * 物流订单id
+     */
+    private Long lOrderId;
+
+    /**
+     * 地址ID
+     */
+    private Long addressId;
+
+    /**
+     * 货物数量
+     */
+    private Double amount;
+
+    /**
+     * 分包量（给下游承运商分包的量）
+     */
+    private Double subcontractAmount;
+
+    /**
+     * 已委托量（自己承运，给下游司机分配的量）
+     */
+    private Double entrustAmount;
+
+    /**
+     * 装货量（自己承运总装货量）
+     */
+    private Double loadAmount;
+
+    /**
+     * 卸货量（自己承运总卸货量）
+     */
+    private Double unloadAmount;
+
+    /**
+     * 忽略剩余量
+     */
+    private Double ignoreAmount;
+
+    /**
+     * 实际开始时间（装货）
+     */
+    private Date loadTime;
+
+    /**
+     * 实际结束时间（卸货）
+     */
+    private Date unloadTime;
+
+    /**
+     * 装货-履约量（自己下游承运总装货量）
+     */
+    private Double totalLoadAmount;
+
+    /**
+     * 卸货-履约量（自己下游承运总卸货量）
+     */
+    private Double totalUnloadAmount;
+}

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

@@ -0,0 +1,100 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+
+/**
+ * @author zk
+ * @desc 物流订单-线路运价信息
+ * @date 2024/3/1 0001
+ */
+@Data
+@TableName("kwt_logistics_order_line_freight_rate")
+public class KwtLogisticsOrderLineFreightRate extends BaseModel {
+
+    /**
+     * 物流订单id
+     */
+    private Long lOrderId;
+
+    /**
+     * 线路名称
+     */
+    private String name;
+
+    /**
+     * 起始地-地址名称
+     */
+    private String loadName;
+
+    /**
+     * 起始地-所在地区
+     */
+    private Integer loadCityCode;
+
+    /**
+     * 起始地-所属区域名称
+     */
+    private String loadCityName;
+
+    /**
+     * 起始地-详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 起始地-纬度
+     */
+    private String loadLat;
+
+    /**
+     * 起始地-经度
+     */
+    private String loadLng;
+
+    /**
+     * 目的地-地址名称
+     */
+    private String unloadName;
+
+    /**
+     * 目的地-所在地区
+     */
+    private Integer unloadCityCode;
+
+    /**
+     * 目的地-所属区域名称
+     */
+    private String unloadCityName;
+
+    /**
+     * 目的地-详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 目的地-纬度
+     */
+    private String unloadLat;
+
+    /**
+     * 目的地-经度
+     */
+    private String unloadLng;
+
+    /**
+     * 运输里程
+     */
+    private Double transportMileage;
+
+    /**
+     * 运输单价（元/公里）
+     */
+    private Double transportPrice;
+
+    /**
+     * 结算货物数量
+     */
+    private Double settlementAmount;
+}

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

@@ -4,6 +4,7 @@ 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,6 +86,16 @@ public class KwtWaybillOrderAddress implements Serializable {
      */
     private Integer entryType;
 
+    /**
+     * 排序（升序）
+     */
+    private Integer sort;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
     /**
      * 用户状态（0有效、1无效）
      */

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

@@ -0,0 +1,76 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @author zk
+ * @desc 车辆运单-子运单
+ * @date 2024/3/1 0001
+ */
+@Data
+@TableName("kwt_waybill_order_subtask")
+public class KwtWaybillOrderSubtask extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 物流订单id（kwt_logistics_order）
+     */
+    private Long lOrderId;
+
+    /**
+     * 物流订单id
+     */
+    private Long wOrderId;
+
+    /**
+     * 编号
+     */
+    private String wOrderNo;
+
+    /**
+     * 托量单位
+     */
+    private String unit;
+
+    /**
+     * 已委托量
+     */
+    private Double entrustAmount;
+
+    /**
+     * 卸货重量
+     */
+    private Double unloadAmount;
+
+    /**
+     * 计划结束日期
+     */
+    private Date unloadTime;
+
+    /**
+     * 装货重量
+     */
+    private Double loadAmount;
+
+    /**
+     * 计划开始日期
+     */
+    private Date loadTime;
+
+    /**
+     * 亏吨重量
+     */
+    private Double deficitAmount;
+
+    /**
+     * 亏吨扣款
+     */
+    private Double deficitPrice;
+}

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

@@ -27,6 +27,16 @@ public class KwtWaybillOrderTicket implements Serializable {
      */
     private Long wOrderId;
 
+    /**
+     *车 辆运单子单ID
+     */
+    private Long wSubtaskId;
+
+    /**
+     * 车辆运单地址ID
+     */
+    private Long wAddressId;
+
     /**
      * 磅单类型（1装货单/2卸货单）
      */

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

@@ -26,6 +26,11 @@ public class KwtWaybillOrderTrack implements Serializable {
      */
     private Long wOrderId;
 
+    /**
+     *车 辆运单子单ID
+     */
+    private Long wSubtaskId;
+
     /**
      * 备注
      */

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

@@ -0,0 +1,60 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Data;
+
+/**
+ * @author zk
+ * @desc TODO
+ * @date 2024/3/1 0001
+ */
+@Data
+@TableName("kwt_waybill_orderV1")
+public class KwtWaybillOrderV1 extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 编号
+     */
+    private String wOrderNo;
+
+    /**
+     * 派车类型(1：趟次:2：循环)
+     */
+    private Integer type;
+
+    /**
+     * 车辆档案ID
+     */
+    private Long truckId;
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
+    /**
+     * 司机姓名
+     */
+    private String driverName;
+
+    /**
+     * 司机手机号
+     */
+    private String driverPhone;
+
+    /**
+     * 司机身份证号码
+     */
+    private String driverIdcard;
+}

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

@@ -0,0 +1,13 @@
+package com.sckw.transport.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zk
+ * @desc 物流订单-装卸货地址运量信息
+ * @date 2024/3/1 0001
+ */
+@Service
+public class KwtLogisticsOrderAmountService {
+
+}

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

@@ -0,0 +1,13 @@
+package com.sckw.transport.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zk
+ * @desc 物流订单-线路运价信息
+ * @date 2024/3/1 0001
+ */
+@Service
+public class KwtLogisticsOrderLineFreightRateService {
+
+}

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

@@ -3003,6 +3003,15 @@ public class KwtWaybillOrderService {
         return HttpResult.ok(map);
     }
 
+    /*--------------------多装多卸--------------------*/
+
+
+
+
+
+
+
+
     /**
      * @param type  字典类型
      * @param value 字典值
@@ -3035,4 +3044,5 @@ public class KwtWaybillOrderService {
         dictKey = dictKey.stream().distinct().collect(Collectors.toList());
         return remoteSystemService.queryDictMapByTypeValues(String.join(Global.COMMA, dictKey));
     }
+
 }

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

@@ -0,0 +1,12 @@
+package com.sckw.transport.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zk
+ * @desc 车辆运单-子运单
+ * @date 2024/3/1 0001
+ */
+@Service
+public class KwtWaybillOrderSubtaskService {
+}

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderAmountMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderAmountMapper">
+
+    <select id="findByAddress" resultType="com.sckw.transport.model.KwtLogisticsOrderAmount" >
+        select * from kwt_logistics_order_amount
+        where del_flag = 0
+        and l_order_id = #{lOrderId, jdbcType=BIGINT}
+        and address_id = #{addressId, jdbcType=BIGINT}
+    </select>
+</mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderLineFreightRateMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderLineFreightRateMapper">
+
+    <select id="findByAddress" resultType="com.sckw.transport.model.KwtLogisticsOrderLineFreightRate" >
+        select * from kwt_logistics_order_line_freight_rate
+        where del_flag = 0
+        and l_order_id = #{lOrderId, jdbcType=BIGINT}
+        and name = #{name, jdbcType=VARCHAR}
+    </select>
+</mapper>

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderSubtaskMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.transport.dao.KwtWaybillOrderSubtaskMapper">
+
+    <select id="findByAddress" resultType="com.sckw.transport.model.KwtWaybillOrderSubtask" >
+        select * from kwt_logistics_order_amount
+        where del_flag = 0
+        and l_order_id = #{lOrderId, jdbcType=BIGINT}
+        and w_order_id = #{wOrderId, jdbcType=BIGINT}
+    </select>
+</mapper>