提交采购订单生成物流托运

提交托运订单查询页面详情数据

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -316,6 +316,10 @@ public class DateUtil {
         return name;
     }
 
+    public static Date LocalDateTimeToDate(LocalDateTime localDateTime) {
+       return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
     public static enum Week {
         SUNDAY("星期日", "Sunday", 0),
         MONDAY("星期一", "Monday", 1),

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -60,7 +60,7 @@ public class KwoTradeOrder extends BaseModel {
     /**
      * 结束日期
      */
-    private LocalDateTime entTime;
+    private LocalDateTime endTime;
 
     /**
      * 已委托量

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

@@ -1,12 +1,16 @@
 package com.sckw.transport.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import com.sckw.transport.service.LogisticsConsignmentService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,13 +31,15 @@ public class LogisticsConsignmentController {
 
     /**
      * 采购订单-物流托运
-     * @param query 查询参数
+     * @param logisticsConsignmentParam
      * @return
      */
+    @Validated
     @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
-    public HttpResult purchaseLogisticsConsignment(AcceptCarriageOrderQuery query) {
+    public HttpResult purchaseLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
+        log.info("采购订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.purchaseLogisticsConsignment(query);
+            return logisticsConsignmentService.purchaseLogisticsConsignment(logisticsConsignmentParam);
         } catch (Exception e) {
             log.error("物流托运 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -42,13 +48,14 @@ public class LogisticsConsignmentController {
 
     /**
      * 销售订单-物流托运
-     * @param query 查询参数
+     * @param logisticsConsignmentParam
      * @return
      */
     @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
-    public HttpResult sellLogisticsConsignment(AcceptCarriageOrderQuery query) {
+    public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
+        log.info("销售订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.sellLogisticsConsignment(query);
+            return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam);
         } catch (Exception e) {
             log.error("物流托运 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoProjectOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 项目-销售订单/采购订单mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoProjectOrderMapper extends BaseMapper<KwoProjectOrder> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoTradeOrderAddress;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 交易订单装卸货地址信息mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoTradeOrderAddressMapper extends BaseMapper<KwoTradeOrderAddress> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoTradeOrderGoods;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 交易订单商品信息mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoTradeOrderGoodsMapper extends BaseMapper<KwoTradeOrderGoods> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoTradeOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 交易订单（采购订单/销售订单）mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoTradeOrderMapper extends BaseMapper<KwoTradeOrder> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoTradeOrderTrack;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 交易订单状态记录信息mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoTradeOrderTrackMapper extends BaseMapper<KwoTradeOrderTrack> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwoTradeOrderUnit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 交易订单采购/销售企业信息mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:18
+ */
+@Mapper
+public interface KwoTradeOrderUnitMapper extends BaseMapper<KwoTradeOrderUnit> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwpTransportDemand;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 运需mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:45
+ */
+@Mapper
+public interface KwpTransportDemandMapper extends BaseMapper<KwpTransportDemand> {
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwpWantBuy;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc: 求购mapper
+ * @author: yzc
+ * @date: 2023-06-25 14:45
+ */
+@Mapper
+public interface KwpWantBuyMapper extends BaseMapper<KwpWantBuy> {
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderAddressDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderAddressMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrderAddress;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderAddressDao extends BaseMapper<KwtLogisticsOrderAddress> {
+public interface KwtLogisticsOrderAddressMapper extends BaseMapper<KwtLogisticsOrderAddress> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderAddress record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderCirculateDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderCirculateMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrderCirculate;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderCirculateDao extends BaseMapper<KwtLogisticsOrderCirculate> {
+public interface KwtLogisticsOrderCirculateMapper extends BaseMapper<KwtLogisticsOrderCirculate> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderCirculate record);

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

@@ -0,0 +1,12 @@
+package com.sckw.transport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.transport.model.KwtLogisticsOrderContract;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ */
+@Mapper
+public interface KwtLogisticsOrderContractMapper extends BaseMapper<KwtLogisticsOrderContract> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderGoodsDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderGoodsMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrderGoods;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderGoodsDao extends BaseMapper<KwtLogisticsOrderGoods> {
+public interface KwtLogisticsOrderGoodsMapper extends BaseMapper<KwtLogisticsOrderGoods> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderGoods record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrder;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderDao extends BaseMapper<KwtLogisticsOrder> {
+public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrder record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderSubcontractDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderSubcontractMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrderSubcontract;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderSubcontractDao extends BaseMapper<KwtLogisticsOrderSubcontract> {
+public interface KwtLogisticsOrderSubcontractMapper extends BaseMapper<KwtLogisticsOrderSubcontract> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderSubcontract record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderTrackDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderTrackMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtLogisticsOrderTrack;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtLogisticsOrderTrackDao extends BaseMapper<KwtLogisticsOrderTrack> {
+public interface KwtLogisticsOrderTrackMapper extends BaseMapper<KwtLogisticsOrderTrack> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderTrack record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderUnitDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderUnitMapper.java

@@ -3,9 +3,12 @@ package com.sckw.transport.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.model.KwtLogisticsOrderUnit;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
-public interface KwtLogisticsOrderUnitDao extends BaseMapper<KwtLogisticsOrderUnit> {
+public interface KwtLogisticsOrderUnitMapper extends BaseMapper<KwtLogisticsOrderUnit> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtLogisticsOrderUnit record);
@@ -17,4 +20,14 @@ public interface KwtLogisticsOrderUnitDao extends BaseMapper<KwtLogisticsOrderUn
     int updateByPrimaryKeySelective(KwtLogisticsOrderUnit record);
 
     int updateByPrimaryKey(KwtLogisticsOrderUnit record);
+
+    /**
+     * 根据单据号获取主表关联企业信息
+     *
+     * @param ids
+     * @param unitType
+     * @return
+     */
+    List<KwtLogisticsOrderUnit> selectCompanyBylOrderId(@Param("ids") List<Long> ids, @Param("unitType") Integer unitType);
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtWaybillOrder;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtWaybillOrderDao extends BaseMapper<KwtWaybillOrder> {
+public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtWaybillOrder record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTicketDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTicketMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtWaybillOrderTicket;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtWaybillOrderTicketDao extends BaseMapper<KwtWaybillOrderTicket> {
+public interface KwtWaybillOrderTicketMapper extends BaseMapper<KwtWaybillOrderTicket> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtWaybillOrderTicket record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackDao.java → sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackMapper.java

@@ -5,7 +5,7 @@ import com.sckw.transport.model.KwtWaybillOrderTrack;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface KwtWaybillOrderTrackDao extends BaseMapper<KwtWaybillOrderTrack> {
+public interface KwtWaybillOrderTrackMapper extends BaseMapper<KwtWaybillOrderTrack> {
     int deleteByPrimaryKey(Long id);
 
     int insert(KwtWaybillOrderTrack record);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwoTradeOrderAddressRepository.java

@@ -0,0 +1,12 @@
+package com.sckw.transport.dao.repository;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckw.transport.model.KwoTradeOrderAddress;
+
+/**
+ * @author lfdc
+ * @description 贸易订单repository
+ * @date 2023-07-04 08:07:39
+ */
+public interface KwoTradeOrderAddressRepository extends IService<KwoTradeOrderAddress> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwoTradeOrderRepository.java

@@ -0,0 +1,14 @@
+package com.sckw.transport.dao.repository;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckw.transport.model.KwoTradeOrder;
+
+
+/**
+ * @author lfdc
+ * @description 订单实体repository
+ * @date 2023-07-06 08:07:39
+ */
+//@Mapper
+public interface KwoTradeOrderRepository extends IService<KwoTradeOrder> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderAddressRepository.java

@@ -1,13 +1,13 @@
 package com.sckw.transport.dao.repository;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.sckw.transport.dao.KwtLogisticsOrderAddressDao;
+import com.sckw.transport.model.KwtLogisticsOrderAddress;
 
 /**
  * @author lfdc
  * @description 地址管理repository
  * @date 2023-07-04 08:07:39
  */
-public interface KwtLogisticsOrderAddressRepository extends IService<KwtLogisticsOrderAddressDao> {
+public interface KwtLogisticsOrderAddressRepository extends IService<KwtLogisticsOrderAddress> {
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderContractRepository.java

@@ -0,0 +1,12 @@
+package com.sckw.transport.dao.repository;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckw.transport.model.KwtLogisticsOrderContract;
+
+/**
+ * @author lfdc
+ * @description 合同repository
+ * @date 2023-07-06 08:07:39
+ */
+public interface KwtLogisticsOrderContractRepository extends IService<KwtLogisticsOrderContract> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderGoodsRepository.java

@@ -0,0 +1,13 @@
+package com.sckw.transport.dao.repository;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckw.transport.model.KwtLogisticsOrderGoods;
+
+/**
+ * @author lfdc
+ * @description 物流商品信息管理repository
+ * @date 2023-07-04 08:07:39
+ */
+public interface KwtLogisticsOrderGoodsRepository extends IService<KwtLogisticsOrderGoods> {
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/repository/KwtLogisticsOrderRepository.java

@@ -0,0 +1,12 @@
+package com.sckw.transport.dao.repository;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sckw.transport.model.KwtLogisticsOrder;
+
+/**
+ * @author lfdc
+ * @description 物流订单repository
+ * @date 2023-07-04 08:07:39
+ */
+public interface KwtLogisticsOrderRepository extends IService<KwtLogisticsOrder> {
+}

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

@@ -0,0 +1,32 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 项目-销售订单/采购订单
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_project_order")
+public class KwoProjectOrder extends BaseModel {
+
+    /**
+     * 项目id
+     */
+    private Long projectId;
+
+    /**
+     * 订单id（销售订单/采购订单）
+     */
+    private Long orderId;
+
+}

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

@@ -0,0 +1,80 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @desc: 交易订单（采购订单/销售订单）
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw_order.kwo_trade_order")
+public class KwoTradeOrder extends BaseModel {
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 货物数量
+     */
+    private BigDecimal amount;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 交易方式(预付款、货到付款）
+     */
+    private Long trading;
+
+    /**
+     * 提货方式（采方自提、供应配送）
+     */
+    private Long pickupType;
+
+    /**
+     * 开始日期
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束日期
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
+    /**
+     * 实际交付量
+     */
+    private BigDecimal actualAmount;
+
+    /**
+     * 订单创建来源类型（采购下单/销售代客下单）
+     */
+    private Integer source;
+
+}

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

@@ -0,0 +1,87 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 交易订单装卸货地址信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_trade_order_address")
+public class KwoTradeOrderAddress extends BaseModel {
+
+    /**
+     * 交易订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 地址类型（1装货地址、2卸货地址）
+     */
+    private Integer addressType;
+
+    /**
+     * 地址名称
+     */
+    private String name;
+
+    /**
+     * 地址类型
+     */
+    private Long type;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 所在地区
+     */
+    private Integer cityCode;
+
+    /**
+     * 所属区域名称
+     */
+    private String cityName;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 电子围栏
+     */
+    private String fence;
+
+}

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

@@ -0,0 +1,37 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 交易订单合同（采购合同/销售合同）
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_trade_order_contract")
+public class KwoTradeOrderContract extends BaseModel {
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 订单id（销售订单/采购订单）
+     */
+    private Long tOrderId;
+
+    /**
+     * 订单编号（销售订单/采购订单）
+     */
+    private String tOrderNo;
+
+}

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

@@ -0,0 +1,59 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @desc: 交易订单商品信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_trade_order_goods")
+public class KwoTradeOrderGoods extends BaseModel {
+
+    /**
+     * 交易订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 商品id
+     */
+    private Long goodsId;
+
+    /**
+     * sku
+     */
+    private Long skuId;
+
+    /**
+     * 数量
+     */
+    private BigDecimal amount;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * kwp_goods_price_range表主键ID
+     */
+    private Long priceRangeId;
+
+}

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

@@ -0,0 +1,32 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 交易订单状态记录信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_trade_order_track")
+public class KwoTradeOrderTrack extends BaseModel {
+
+    /**
+     * 交易订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+}

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

@@ -0,0 +1,57 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+/**
+ * @desc: 交易订单采购/销售企业信息
+ * @author: yzc
+ * @date: 2023-06-25 9:31
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwo_trade_order_unit")
+public class KwoTradeOrderUnit extends BaseModel {
+
+    /**
+     * 交易订单id
+     */
+    private Long tOrderId;
+
+    /**
+     * 订单编号
+     */
+    private String tOrderNo;
+
+    /**
+     * 单位类型（1销售单位、2采购单位）
+     */
+    private Integer unitType;
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 企业名称
+     */
+    private String firmName;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+}

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

@@ -0,0 +1,73 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @desc: 运需
+ * @author: yzc
+ * @date: 2023-06-25 9:04
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwp_transport_demand")
+public class KwpTransportDemand extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private Long typeId;
+
+    /**
+     * 尺寸大小
+     */
+    private String size;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 采购方式（线下支付、电子钱包、银联转账、第三方支付）
+     */
+    private Integer paymentChannel;
+
+    /**
+     * 运需单价（元）
+     */
+    private BigDecimal price;
+
+    /**
+     * 运输总量
+     */
+    private BigDecimal totalNum;
+
+    /**
+     * 装货地址id
+     */
+    private Long shippingAddressId;
+
+    /**
+     * 卸货地址id
+     */
+    private Long unloadingAddressId;
+}

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

@@ -0,0 +1,63 @@
+package com.sckw.transport.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sckw.core.model.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @desc: 求购
+ * @author: yzc
+ * @date: 2023-06-25 9:04
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("sckw.kwp_want_buy")
+public class KwpWantBuy extends BaseModel {
+
+    /**
+     * 企业id
+     */
+    private Long entId;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private Long typeId;
+
+    /**
+     * 尺寸大小
+     */
+    private String size;
+
+    /**
+     * 单位（吨、方、件、箱、其他）
+     */
+    private String unit;
+
+    /**
+     * 采购方式（线下支付、电子钱包、银联转账、第三方支付）
+     */
+    private Integer paymentChannel;
+
+    /**
+     * 运需单价（元）
+     */
+    private BigDecimal price;
+
+    /**
+     * 运输总量
+     */
+    private BigDecimal totalNum;
+}

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

@@ -1,5 +1,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;
@@ -12,6 +14,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order")
 public class KwtLogisticsOrder implements Serializable {
     /**
      * 主键
@@ -26,12 +29,22 @@ public class KwtLogisticsOrder implements Serializable {
     /**
      * 交易订单id（kwo_trade_order）
      */
-    private Long orderId;
+    private Long tOrderId;
 
     /**
-     * 编号
+     * 交易订单编号（kwo_trade_order）
      */
-    private String code;
+    private String tOrderNo;
+
+    /**
+     * 物流订单编号
+     */
+    private String lOrderNo;
+
+    /**
+     * 分包上级物流订单id
+     */
+    private Long pid;
 
     /**
      * 结算周期(周结、月结、季结)
@@ -123,11 +136,6 @@ public class KwtLogisticsOrder implements Serializable {
      */
     private BigDecimal deficitPrice;
 
-    /**
-     * 备注
-     */
-    private String remark;
-
     /**
      * 付款方式(预付款、线下支付、第三方支付）
      */
@@ -138,10 +146,15 @@ public class KwtLogisticsOrder implements Serializable {
      */
     private BigDecimal taxRate;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
     /**
      * 用户状态（0正常、1已锁）
      */
-    private Integer status;
+    private Integer status = 0;
 
     private Long createBy;
 
@@ -157,7 +170,8 @@ public class KwtLogisticsOrder implements Serializable {
     /**
      * 是否删除（0未删除，1删除）
      */
-    private Integer delFlag;
+    @TableLogic(value = "0")
+    private Integer delFlag = 0;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,5 +1,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;
@@ -11,6 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderAddress implements Serializable {
     /**
      * 主键
@@ -90,7 +93,7 @@ public class KwtLogisticsOrderAddress implements Serializable {
     /**
      * 用户状态（0正常、1已锁）
      */
-    private Integer status;
+    private Integer status = 0;
 
     private Long createBy;
 
@@ -106,7 +109,8 @@ public class KwtLogisticsOrderAddress implements Serializable {
     /**
      * 是否删除（0未删除，1删除）
      */
-    private Integer delFlag;
+    @TableLogic("0")
+    private Integer delFlag = 0;
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderCirculate implements Serializable {
     /**
      * 主键

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

@@ -0,0 +1,62 @@
+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.util.Date;
+
+/**
+ * @author lfdc
+ * @description 物流订单-合同（承运合同/托运合同）
+ * @date 2023-07-06 16:06:12
+ */
+@Data
+@TableName("kwt_logistics_order_contract")
+public class KwtLogisticsOrderContract implements Serializable {
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 物流订单id
+     */
+    private Long lOrderId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 用户状态（0正常、1已锁）
+     */
+    private Integer status = 0;
+
+    private Long createBy;
+
+    private Date createTime;
+
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 是否删除（0未删除，1删除）
+     */
+    @TableLogic("0")
+    private Integer delFlag = 0;
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.io.Serializable;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderGoods implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderSubcontract implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtLogisticsOrderTrack implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_unit")
 public class KwtLogisticsOrderUnit implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -13,6 +14,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtWaybillOrder implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,6 +13,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtWaybillOrderTicket implements Serializable {
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,6 +12,7 @@ import java.util.Date;
  * @date 2023-06-26 16:06:12
  */
 @Data
+@TableName("sckw_transport.kwt_logistics_order_address")
 public class KwtWaybillOrderTrack implements Serializable {
     /**
      * 主键

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ConsignOrderQuery.java

@@ -2,6 +2,7 @@ package com.sckw.transport.model.param;
 
 import com.sckw.core.model.page.PageRequest;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
@@ -11,6 +12,34 @@ import java.io.Serializable;
  * @date 2023-06-30 09:06:43
  */
 @Data
+@Accessors(chain = true)
 public class ConsignOrderQuery extends PageRequest implements Serializable {
-
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+    /**
+     * 结束时间
+     */
+    private String endDateTime;
+    /**
+     * 关键字搜索
+     */
+    private String keywords;
+    /**
+     * 装货地址
+     */
+    private String loadAddress;
+    /**
+     * 开始时间
+     */
+    private String startDateTime;
+    /**
+     * 单据状态
+     */
+    private String status;
+    /**
+     * 卸货地址
+     */
+    private String unloadAddress;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/LogisticsConsignmentParam.java

@@ -0,0 +1,109 @@
+package com.sckw.transport.model.param;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author lfdc
+ * @description 物流托运bo
+ * @date 2023-07-06 14:07:50
+ */
+
+@Data
+@Accessors(chain = true)
+public class LogisticsConsignmentParam {
+    /**
+     * 分配承运量
+     */
+    private Long carryingCapacity;
+    /**
+     * 合理损耗
+     */
+    private Long loss;
+    /**
+     * 合理损耗单位
+     */
+    private String lossUnit;
+
+    /**
+     * 商品价值（扣亏货值）
+     */
+    private Long goodsPrice;
+    /**
+     * 商品价值（扣亏货值）单位
+     */
+    private String goodsPriceUnit;
+    /**
+     * 承运单位
+     */
+    @NotBlank(message = "承运单位不能为空")
+    private String consignCompany;
+
+    /**
+     * 结算周期(周结、月结、季结)
+     */
+    private Long settlementCycle;
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 合同
+     */
+    private String contract;
+    /**
+     * 合同id
+     */
+    private String contractId;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+    /**
+     * 是否全量
+     */
+    private Boolean isFullDose;
+    /**
+     * 订单id
+     */
+    private String lOrderId;
+    /**
+     * 订单编号
+     */
+    private String lOrderNo;
+    /**
+     * 运价
+     */
+    @NotNull(message = "运价不能为空")
+    private Long price;
+    /**
+     * 运价方式
+     */
+    private String priceType;
+    /**
+     * 计划收货时间
+     */
+    private String receiveGoodsDateTime;
+    /**
+     * 计划发货时间
+     */
+    private String shipmentsDateTime;
+    /**
+     * 税率
+     */
+    private Long taxRate;
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,135 @@
+package com.sckw.transport.model.vo;
+
+import com.sckw.core.model.page.PageResult;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author lfdc
+ * @description 托运订单查询数据返回vo
+ * @date 2023-07-07 09:07:06
+ */
+@Data
+public class ConsignOrderVo extends PageResult implements Serializable {
+    /**
+     * 结算周期
+     */
+    private String accountsCycle;
+    /**
+     * 发起人
+     */
+    private String appointor;
+    /**
+     * 计费方式
+     */
+    private String billingMode;
+    /**
+     * 承运单位
+     */
+    private String carrierCompany;
+    /**
+     * 承运联系人
+     */
+    private String carrierContacts;
+    /**
+     * 承运订单
+     */
+    private String carrierOrder;
+    /**
+     * 承运联系电话
+     */
+    private String carrierPhone;
+    /**
+     * 分配承运量
+     */
+    private String carryingCapacity;
+    /**
+     * 托运单位
+     */
+    private String consignCompany;
+    /**
+     * 托运联系人
+     */
+    private String consignContacts;
+    /**
+     * 托运联系电话
+     */
+    private String consignPhone;
+    /**
+     * 合同
+     */
+    private String contract;
+    /**
+     * 扣亏货值/元/吨
+     */
+    private String deficitAmount;
+    /**
+     * 货物名称
+     */
+    private String goodsName;
+    /**
+     * 装货地点
+     */
+    private String loadAddress;
+    /**
+     * 数据库id
+     */
+    private String lOrderId;
+    /**
+     * 托运订单号
+     */
+    private String lOrderNo;
+    /**
+     * 合理损耗
+     */
+    private String loss;
+    /**
+     * 计划时间
+     */
+    private String plannedDateTime;
+    /**
+     * 运价
+     */
+    private String price;
+    /**
+     * 收货联系人
+     */
+    private String receiveGoodsContacts;
+    /**
+     * 计划收货时间
+     */
+    private String receiveGoodsDateTime;
+    /**
+     * 收货电话
+     */
+    private String receiveGoodsPhone;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 发货联系人
+     */
+    private String shipmentsContacts;
+    /**
+     * 计划发货时间
+     */
+    private String shipmentsDateTime;
+    /**
+     * 发货电话
+     */
+    private String shipmentsPhone;
+    /**
+     * 签约方式
+     */
+    private String signing;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 卸货地点
+     */
+    private String unloadAddress;
+}

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

@@ -0,0 +1,15 @@
+package com.sckw.transport.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lfdc
+ * @description 通用Service
+ * @date 2023-07-06 13:07:43
+ */
+@Slf4j
+@Service
+public class CommonService {
+
+}

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

@@ -1,16 +1,28 @@
 package com.sckw.transport.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.dao.KwtLogisticsOrderAddressDao;
+import com.sckw.transport.dao.KwtLogisticsOrderAddressMapper;
+import com.sckw.transport.dao.KwtLogisticsOrderMapper;
+import com.sckw.transport.dao.KwtLogisticsOrderUnitMapper;
 import com.sckw.transport.dao.repository.KwtLogisticsOrderAddressRepository;
+import com.sckw.transport.dao.repository.KwtLogisticsOrderRepository;
+import com.sckw.transport.model.KwtLogisticsOrder;
+import com.sckw.transport.model.KwtLogisticsOrderUnit;
 import com.sckw.transport.model.param.ConsignOrderQuery;
+import com.sckw.transport.model.vo.ConsignOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author lfdc
- * @description 承运订单service
+ * @description 托运订单service
  * @date 2023-06-26 16:06:13
  */
 @Slf4j
@@ -18,12 +30,28 @@ import org.springframework.stereotype.Service;
 public class ConsignOrderService {
 
     @Autowired
-    KwtLogisticsOrderAddressRepository kwtLogisticsOrderAddressRepository;
+    public KwtLogisticsOrderRepository kwtLogisticsOrderRepository;
+
+    @Autowired
+    public KwtLogisticsOrderMapper kwtLogisticsOrderMapper;
+    @Autowired
+    public KwtLogisticsOrderAddressRepository kwtLogisticsOrderAddressRepository;
+
+    @Autowired
+    public KwtLogisticsOrderAddressMapper kwtLogisticsOrderAddressMapper;
 
     @Autowired
-    public KwtLogisticsOrderAddressDao kwtLogisticsOrderAddressDao;
+    public KwtLogisticsOrderUnitMapper kwtLogisticsOrderUnitMapper;
 
     public HttpResult list(ConsignOrderQuery query) {
+        ConsignOrderVo consignOrderVo = new ConsignOrderVo();
+        LambdaQueryWrapper<KwtLogisticsOrder> wrapper = new LambdaQueryWrapper<>();
+//        kwtLogisticsOrderRepository.page(new Page<>(query.getPage(), query.getPageSize()),
+//                wrapper.like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getLOrderNo,query.getKeywords())
+//                        .like(StringUtils.isNotBlank(query.getKeywords()),KwtLogisticsOrder::getc))
+        List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderRepository.list(new LambdaQueryWrapper<KwtLogisticsOrder>().like(StringUtils.isNotBlank(query.getKeywords()), KwtLogisticsOrder::getLOrderNo, query.getKeywords()));
+        List<Long> ids = kwtLogisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toList());
+        List<KwtLogisticsOrderUnit> list = kwtLogisticsOrderUnitMapper.selectCompanyBylOrderId(ids, NumberConstant.ONE);
         return null;
     }
 }

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

@@ -1,9 +1,24 @@
 package com.sckw.transport.service;
 
+import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.StringUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.excel.utils.DateUtil;
+import com.sckw.transport.dao.KwoTradeOrderMapper;
+import com.sckw.transport.dao.repository.*;
+import com.sckw.transport.model.*;
+import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author lfdc
@@ -13,12 +28,152 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @Service
 public class LogisticsConsignmentService {
-    public HttpResult purchaseLogisticsConsignment(AcceptCarriageOrderQuery query) {
-        return null;
+
+    @Autowired
+    public KwtLogisticsOrderRepository kwtLogisticsOrderRepository;
+
+    @Autowired
+    public KwtLogisticsOrderAddressRepository kwtLogisticsOrderAddressRepository;
+
+    @Autowired
+    public KwoTradeOrderRepository kwoTradeOrderRepository;
+
+    @Autowired
+    public KwoTradeOrderMapper kwoTradeOrderMapper;
+
+    @Autowired
+    public KwtLogisticsOrderContractRepository kwtLogisticsOrderContractRepository;
+
+    @Autowired
+    public KwoTradeOrderAddressRepository kwoTradeOrderAddressRepository;
+
+    @Autowired
+    public KwtLogisticsOrderGoodsRepository kwtLogisticsOrderGoodsRepository;
+
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo) {
+        logisticsConsignmentInsert(bo);
+        return HttpResult.ok();
     }
 
-    public HttpResult sellLogisticsConsignment(AcceptCarriageOrderQuery query) {
-        return null;
+    @Transactional(rollbackFor = Exception.class)
+    public HttpResult sellLogisticsConsignment(LogisticsConsignmentParam bo) {
+        logisticsConsignmentInsert(bo);
+        return HttpResult.ok();
     }
 
+    void logisticsConsignmentInsert(LogisticsConsignmentParam bo) {
+//        KwoTradeOrder tradeOrder=  kwoTradeOrderDao.selectOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrder::getId, bo.getLOrderId()));
+        KwoTradeOrder tradeOrder = kwoTradeOrderRepository.getOne(new LambdaQueryWrapper<KwoTradeOrder>().eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrder::getId, bo.getLOrderId()));
+        if (tradeOrder == null) {
+            log.error("订单id查找失败:{}", bo.getLOrderId());
+            throw new RuntimeException("单据错误,数据不存在");
+        }
+        KwtLogisticsOrder order = new KwtLogisticsOrder();
+        if (!bo.getIsFullDose()) {
+            if (ArrayUtil.isEmpty(bo.getCarryingCapacity())) {
+                throw new RuntimeException("不是全量分配时,分配量不能为空!");
+            }
+            order.setAmount(new BigDecimal(bo.getCarryingCapacity()));
+        } else {
+            order.setAmount(new BigDecimal(NumberConstant.ZERO));
+            order.setSubcontractAmount(new BigDecimal(NumberConstant.ZERO));
+        }
+        String waybillNo = "";
+        insertLogisticsGoods(bo,waybillNo);
+        insertLogisticsOrder(bo,waybillNo,order,tradeOrder);
+        insertLogisticsOrderContract(bo);
+        insertOrderAddress(bo, waybillNo);
+    }
+
+    private void insertLogisticsGoods(LogisticsConsignmentParam bo, String waybillNo) {
+        KwtLogisticsOrderGoods kwtLogisticsOrderGoods = new KwtLogisticsOrderGoods();
+        kwtLogisticsOrderGoods.setId(new IdWorker(NumberConstant.ONE).nextId());
+        kwtLogisticsOrderGoods.setGoodsId(45646565L);
+        kwtLogisticsOrderGoods.setOrderId(Long.parseLong(bo.getLOrderId()));
+        kwtLogisticsOrderGoods.setOrderNo(bo.getLOrderNo());
+        kwtLogisticsOrderGoodsRepository.save(kwtLogisticsOrderGoods);
+    }
+
+    private void insertLogisticsOrder(LogisticsConsignmentParam bo, String waybillNo, KwtLogisticsOrder order, KwoTradeOrder tradeOrder) {
+        order.setId(new IdWorker(NumberConstant.ONE).nextId());
+        order.setEntId(LoginUserHolder.getEntId());
+        order.setTOrderId(Long.parseLong(bo.getLOrderId()));
+        order.setTOrderNo(bo.getLOrderNo());
+        order.setLOrderNo(waybillNo);
+        order.setPid(null);
+        order.setSettlementCycle(bo.getSettlementCycle());
+        order.setPrice(new BigDecimal(bo.getPrice()));
+        order.setPriceType(Long.parseLong(bo.getPriceType()));
+        order.setAmount(tradeOrder.getAmount());
+        order.setUnit(tradeOrder.getUnit());
+        order.setLoss(new BigDecimal(bo.getLoss()));
+        order.setLossUnit(bo.getLossUnit());
+        order.setGoodsPrice(new BigDecimal(bo.getGoodsPrice()));
+        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
+        order.setStartTime(DateUtil.LocalDateTimeToDate(tradeOrder.getStartTime()));
+        order.setEntTime(DateUtil.LocalDateTimeToDate(tradeOrder.getEndTime()));
+        order.setRemark(bo.getRemark());
+        order.setPayment(tradeOrder.getTrading());
+        order.setTaxRate(new BigDecimal(bo.getTaxRate()));
+        order.setCreateBy(LoginUserHolder.getUserId());
+        order.setCreateTime(new Date());
+        order.setUpdateBy(LoginUserHolder.getUserId());
+        order.setUpdateTime(new Date());
+        kwtLogisticsOrderRepository.save(order);
+    }
+
+    private void insertLogisticsOrderContract(LogisticsConsignmentParam bo) {
+        KwtLogisticsOrderContract kwtLogisticsOrderContract = new KwtLogisticsOrderContract();
+        kwtLogisticsOrderContract.setId(new IdWorker(NumberConstant.ONE).nextId());
+        kwtLogisticsOrderContract.setLOrderId(Long.parseLong(bo.getLOrderId()));
+        kwtLogisticsOrderContract.setContractId(Long.parseLong(bo.getContractId()));
+        kwtLogisticsOrderContract.setRemark(bo.getRemark());
+        kwtLogisticsOrderContract.setCreateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderContract.setUpdateBy(LoginUserHolder.getUserId());
+        kwtLogisticsOrderContract.setCreateTime(new Date());
+        kwtLogisticsOrderContract.setUpdateTime(new Date());
+        kwtLogisticsOrderContractRepository.save(kwtLogisticsOrderContract);
+    }
+
+    private void insertOrderAddress(LogisticsConsignmentParam bo, String waybillNo) {
+        KwtLogisticsOrderAddress loadOrderAddress = new KwtLogisticsOrderAddress();
+        KwtLogisticsOrderAddress unloadOrderAddress = new KwtLogisticsOrderAddress();
+        KwoTradeOrderAddress loadkwoTradeOrderAddress = kwoTradeOrderAddressRepository.getOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
+                .eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrderAddress::getTOrderId, bo.getLOrderId())
+                .eq(KwoTradeOrderAddress::getAddressType, NumberConstant.ONE));
+        loadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
+        loadOrderAddress.setAddressType(NumberConstant.ONE);
+        loadOrderAddress.setDetailAddress(loadkwoTradeOrderAddress.getDetailAddress());
+        loadOrderAddress.setContacts(loadkwoTradeOrderAddress.getContacts());
+        loadOrderAddress.setOrderId(Long.parseLong(waybillNo));
+        loadOrderAddress.setLat(loadkwoTradeOrderAddress.getLat());
+        loadOrderAddress.setFence(loadkwoTradeOrderAddress.getFence());
+        loadOrderAddress.setCityName(loadkwoTradeOrderAddress.getCityName());
+        loadOrderAddress.setEntryType(NumberConstant.FOUR);
+        loadOrderAddress.setCreateTime(new Date());
+        loadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
+        loadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
+        loadOrderAddress.setUpdateTime(new Date());
+        kwtLogisticsOrderAddressRepository.save(loadOrderAddress);
+
+        KwoTradeOrderAddress unloadkwoTradeOrderAddress = kwoTradeOrderAddressRepository.getOne(new LambdaQueryWrapper<KwoTradeOrderAddress>()
+                .eq(StringUtils.isNotBlank(bo.getLOrderId()), KwoTradeOrderAddress::getTOrderId, bo.getLOrderId())
+                .eq(KwoTradeOrderAddress::getAddressType, NumberConstant.TWO));
+        unloadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
+        unloadOrderAddress.setAddressType(NumberConstant.TWO);
+        unloadOrderAddress.setId(new IdWorker(NumberConstant.ONE).nextId());
+        unloadOrderAddress.setContacts(loadkwoTradeOrderAddress.getContacts());
+        unloadOrderAddress.setOrderId(Long.parseLong(waybillNo));
+        unloadOrderAddress.setLat(loadkwoTradeOrderAddress.getLat());
+        unloadOrderAddress.setFence(loadkwoTradeOrderAddress.getFence());
+        unloadOrderAddress.setCityName(loadkwoTradeOrderAddress.getCityName());
+        unloadOrderAddress.setEntryType(NumberConstant.FOUR);
+        unloadOrderAddress.setDetailAddress(unloadkwoTradeOrderAddress.getDetailAddress());
+        unloadOrderAddress.setCreateTime(new Date());
+        unloadOrderAddress.setCreateBy(LoginUserHolder.getUserId());
+        unloadOrderAddress.setUpdateBy(LoginUserHolder.getUserId());
+        unloadOrderAddress.setUpdateTime(new Date());
+        kwtLogisticsOrderAddressRepository.save(unloadOrderAddress);
+    }
 }

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

@@ -0,0 +1,17 @@
+package com.sckw.transport.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.transport.dao.KwoTradeOrderMapper;
+import com.sckw.transport.dao.repository.KwoTradeOrderRepository;
+import com.sckw.transport.model.KwoTradeOrder;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lfdc
+ * @description
+ * @date 2023-07-06 17:07:40
+ */
+@Service
+public class OutboundHeadServiceImpl extends ServiceImpl<KwoTradeOrderMapper, KwoTradeOrder> implements KwoTradeOrderRepository {
+
+}

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -5,7 +5,7 @@ spring:
         # 服务注册地址
         server-addr: 10.10.10.230:8848
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
       config:
@@ -14,7 +14,7 @@ spring:
         # 配置文件格式
         file-extension: yaml
         # 命名空间
-        namespace: sckw-service-platform-dev
+        namespace: sckw_lfdc
         # 共享配置
         group: sckw-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组

sckw-modules/sckw-transport/src/main/resources/bootstrap-local.yml

@@ -169,3 +169,5 @@ aliyun:
     accessKeyId: LTAI5tPEbubCGq5Rdwygbz4Q
     secret: 7mQLWMaBJeZPRV1SRGogctYGXwppjQ
     bucket: kaiwu-saas
+links:
+isBindManyRole:

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

@@ -0,0 +1,9 @@
+<?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.KwoTradeOrderDao">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwoTradeOrder">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="t_order_no" jdbcType="BIGINT" property="tOrderNo" />
+        <result column="amount" jdbcType="INTEGER" property="amount" />
+    </resultMap>
+</mapper>

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

@@ -1,6 +1,6 @@
 <?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.KwtLogisticsOrderAddressDao">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderAddressMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderAddress">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="order_id" jdbcType="BIGINT" property="orderId" />

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

@@ -1,6 +1,6 @@
 <?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.KwtLogisticsOrderCirculateDao">
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderCirculateMapper">
   <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderCirculate">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="ent_id" jdbcType="BIGINT" property="entId" />

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

@@ -1,199 +1,212 @@
 <?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.KwtLogisticsOrderUnitDao">
-  <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderUnit">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="order_id" jdbcType="BIGINT" property="orderId" />
-    <result column="unit_type" jdbcType="INTEGER" property="unitType" />
-    <result column="ent_id" jdbcType="BIGINT" property="entId" />
-    <result column="firm_name" jdbcType="VARCHAR" property="firmName" />
-    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
-    <result column="phone" jdbcType="VARCHAR" property="phone" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="create_by" jdbcType="BIGINT" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="BIGINT" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, order_id, unit_type, ent_id, firm_name, contacts, phone, remark, `status`,
+<mapper namespace="com.sckw.transport.dao.KwtLogisticsOrderUnitMapper">
+    <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrderUnit">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="order_id" jdbcType="BIGINT" property="orderId"/>
+        <result column="unit_type" jdbcType="INTEGER" property="unitType"/>
+        <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="firm_name" jdbcType="VARCHAR" property="firmName"/>
+        <result column="contacts" jdbcType="VARCHAR" property="contacts"/>
+        <result column="phone" jdbcType="VARCHAR" property="phone"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        , order_id, unit_type, ent_id, firm_name, contacts, phone, remark, `status`,
     create_by, create_time, update_by, update_time, del_flag
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from kwt_logistics_order_unit
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from kwt_logistics_order_unit
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
-    insert into kwt_logistics_order_unit (id, order_id, unit_type, 
-      ent_id, firm_name, contacts, 
-      phone, remark, `status`,
-      create_by, create_time, update_by, 
-      update_time, del_flag)
-    values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{unitType,jdbcType=INTEGER}, 
-      #{entId,jdbcType=BIGINT}, #{firmName,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
-      #{phone,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
-      #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
-    insert into kwt_logistics_order_unit
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="orderId != null">
-        order_id,
-      </if>
-      <if test="unitType != null">
-        unit_type,
-      </if>
-      <if test="entId != null">
-        ent_id,
-      </if>
-      <if test="firmName != null">
-        firm_name,
-      </if>
-      <if test="contacts != null">
-        contacts,
-      </if>
-      <if test="phone != null">
-        phone,
-      </if>
-      <if test="remark != null">
-        remark,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="delFlag != null">
-        del_flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="orderId != null">
-        #{orderId,jdbcType=BIGINT},
-      </if>
-      <if test="unitType != null">
-        #{unitType,jdbcType=INTEGER},
-      </if>
-      <if test="entId != null">
-        #{entId,jdbcType=BIGINT},
-      </if>
-      <if test="firmName != null">
-        #{firmName,jdbcType=VARCHAR},
-      </if>
-      <if test="contacts != null">
-        #{contacts,jdbcType=VARCHAR},
-      </if>
-      <if test="phone != null">
-        #{phone,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
-    update kwt_logistics_order_unit
-    <set>
-      <if test="orderId != null">
-        order_id = #{orderId,jdbcType=BIGINT},
-      </if>
-      <if test="unitType != null">
-        unit_type = #{unitType,jdbcType=INTEGER},
-      </if>
-      <if test="entId != null">
-        ent_id = #{entId,jdbcType=BIGINT},
-      </if>
-      <if test="firmName != null">
-        firm_name = #{firmName,jdbcType=VARCHAR},
-      </if>
-      <if test="contacts != null">
-        contacts = #{contacts,jdbcType=VARCHAR},
-      </if>
-      <if test="phone != null">
-        phone = #{phone,jdbcType=VARCHAR},
-      </if>
-      <if test="remark != null">
-        remark = #{remark,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="createBy != null">
-        create_by = #{createBy,jdbcType=BIGINT},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        update_by = #{updateBy,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        del_flag = #{delFlag,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
-    update kwt_logistics_order_unit
-    set order_id = #{orderId,jdbcType=BIGINT},
-      unit_type = #{unitType,jdbcType=INTEGER},
-      ent_id = #{entId,jdbcType=BIGINT},
-      firm_name = #{firmName,jdbcType=VARCHAR},
-      contacts = #{contacts,jdbcType=VARCHAR},
-      phone = #{phone,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR},
-      `status` = #{status,jdbcType=INTEGER},
-      create_by = #{createBy,jdbcType=BIGINT},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_by = #{updateBy,jdbcType=BIGINT},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      del_flag = #{delFlag,jdbcType=INTEGER}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from kwt_logistics_order_unit
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from kwt_logistics_order_unit
+        where id = #{id,jdbcType=BIGINT}
+    </delete>
+    <insert id="insert" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
+        insert into kwt_logistics_order_unit (id, order_id, unit_type,
+                                              ent_id, firm_name, contacts,
+                                              phone, remark, `status`,
+                                              create_by, create_time, update_by,
+                                              update_time, del_flag)
+        values (#{id,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{unitType,jdbcType=INTEGER},
+                #{entId,jdbcType=BIGINT}, #{firmName,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR},
+                #{phone,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+                #{createBy,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT},
+                #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=INTEGER})
+    </insert>
+    <insert id="insertSelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
+        insert into kwt_logistics_order_unit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="orderId != null">
+                order_id,
+            </if>
+            <if test="unitType != null">
+                unit_type,
+            </if>
+            <if test="entId != null">
+                ent_id,
+            </if>
+            <if test="firmName != null">
+                firm_name,
+            </if>
+            <if test="contacts != null">
+                contacts,
+            </if>
+            <if test="phone != null">
+                phone,
+            </if>
+            <if test="remark != null">
+                remark,
+            </if>
+            <if test="status != null">
+                `status`,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
+            </if>
+            <if test="orderId != null">
+                #{orderId,jdbcType=BIGINT},
+            </if>
+            <if test="unitType != null">
+                #{unitType,jdbcType=INTEGER},
+            </if>
+            <if test="entId != null">
+                #{entId,jdbcType=BIGINT},
+            </if>
+            <if test="firmName != null">
+                #{firmName,jdbcType=VARCHAR},
+            </if>
+            <if test="contacts != null">
+                #{contacts,jdbcType=VARCHAR},
+            </if>
+            <if test="phone != null">
+                #{phone,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                #{status,jdbcType=INTEGER},
+            </if>
+            <if test="createBy != null">
+                #{createBy,jdbcType=BIGINT},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
+        update kwt_logistics_order_unit
+        <set>
+            <if test="orderId != null">
+                order_id = #{orderId,jdbcType=BIGINT},
+            </if>
+            <if test="unitType != null">
+                unit_type = #{unitType,jdbcType=INTEGER},
+            </if>
+            <if test="entId != null">
+                ent_id = #{entId,jdbcType=BIGINT},
+            </if>
+            <if test="firmName != null">
+                firm_name = #{firmName,jdbcType=VARCHAR},
+            </if>
+            <if test="contacts != null">
+                contacts = #{contacts,jdbcType=VARCHAR},
+            </if>
+            <if test="phone != null">
+                phone = #{phone,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null">
+                `status` = #{status,jdbcType=INTEGER},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy,jdbcType=BIGINT},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                del_flag = #{delFlag,jdbcType=INTEGER},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.sckw.transport.model.KwtLogisticsOrderUnit">
+        update kwt_logistics_order_unit
+        set order_id    = #{orderId,jdbcType=BIGINT},
+            unit_type   = #{unitType,jdbcType=INTEGER},
+            ent_id      = #{entId,jdbcType=BIGINT},
+            firm_name   = #{firmName,jdbcType=VARCHAR},
+            contacts    = #{contacts,jdbcType=VARCHAR},
+            phone       = #{phone,jdbcType=VARCHAR},
+            remark      = #{remark,jdbcType=VARCHAR},
+            `status`    = #{status,jdbcType=INTEGER},
+            create_by   = #{createBy,jdbcType=BIGINT},
+            create_time = #{createTime,jdbcType=TIMESTAMP},
+            update_by   = #{updateBy,jdbcType=BIGINT},
+            update_time = #{updateTime,jdbcType=TIMESTAMP},
+            del_flag    = #{delFlag,jdbcType=INTEGER}
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+
+    <select id="selectCompanyBylOrderId" resultMap="BaseResultMap">
+        SELECT lu.*
+        FROM kwt_logistics_order lo
+        LEFT JOIN kwt_logistics_order_unit lu ON lo.id = lu.l_order_id
+        AND lu.unit_type = #{unitType}
+        AND lo.l_order_no in
+        <foreach collection="list" separator="," open="(" close=")" item="id">
+            #{id}
+        </foreach>
+    </select>
 </mapper>