铲车司机代码

sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/ErrorCodeEnum.java

@@ -63,7 +63,7 @@ public enum ErrorCodeEnum {
     LOGISTICS_ORDER_NOT_DISPATCH_TRUCK("70005", "物流运单无当前派车数据"),
 
     // ====================== 运单订单（80000~89999）======================
-    WAYBILL_ORDER_NOT_FOUND("80000", " 当前物流运单不存在"),
+    WAYBILL_ORDER_NOT_FOUND("80000", "当前物流运单不存在"),
     WAYBILL_ORDER_NOT_UNFINISHED("80001", " 当前车辆有未完成的状态"),
     WAYBILL_ORDER_SUB_NOT_FOUND("80002", " 当前物流子运单不存在"),
     WAYBILL_ORDER_ADDRESS_NOT_FOUND("80003", " 当前物流运单地址不存在"),
@@ -75,6 +75,7 @@ public enum ErrorCodeEnum {
     WAYBILL_NODE_NOT_EXIST("80009", " 物流运单无节点数据"),
 
 
+
     // ====================== 司机/车辆（90000~99999）======================
     DRIVER_NOT_FOUND("600000", "司机信息不存在"),
     DRIVER_STATUS_ERROR("600001", "司机信息状态异常"),
@@ -84,6 +85,8 @@ public enum ErrorCodeEnum {
     ASSOCIATED_TRUCK_EXIST("600005", "司机关联车辆已存在"),
 
 
+    // ====================== 铲车订单（100000~110000）======================
+    FORKLIFT_ORDER_NOT_FOUND("100000", "当前铲车订单不存在"),
 
 
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/ForkliftStatusEnum.java

@@ -14,14 +14,20 @@ import java.util.EnumSet;
 @AllArgsConstructor
 public enum ForkliftStatusEnum {
 
+    /**
+     * 待接单
+     */
+    PENDING_ORDERS(1,  "待接单"),
+
     /**
      * 已接单
      */
-    ORDER_TAKING(1,  "已接单"),
+    ORDER_TAKING(5,  "已接单"),
+
     /**
      * 已完成
      */
-    COMPLETED(5, "已完成"),
+    COMPLETED(10, "已完成"),
 
     ;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/ForkliftAppController.java

@@ -4,6 +4,7 @@ package com.sckw.transport.controller.enterpriseApp;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.transport.model.param.forklift.reponse.ForkliftOrderResp;
+import com.sckw.transport.model.param.forklift.request.ForkliftOrderCancelParam;
 import com.sckw.transport.model.param.forklift.request.ForkliftOrderQueryParam;
 import com.sckw.transport.model.param.forklift.request.ForkliftOrderTakingParam;
 import com.sckw.transport.service.app.ForkliftOrderService;
@@ -30,7 +31,20 @@ public class ForkliftAppController {
     private final ForkliftOrderService forkliftOrderService;
 
     /**
-     * 分页查询铲车运单
+     * 分页查询铲车运单（待接单）
+     *
+     * @param param
+     * @return
+     */
+    @Operation(summary = "分页铲车运单", description = "分页查询铲车的运单")
+    @PostMapping("/pageQueryForkliftWaybillOrder")
+    public BaseResult<PageDataResult<ForkliftOrderResp>> pageQueryForkliftWaybillOrder(@RequestBody @Valid ForkliftOrderQueryParam param){
+        PageDataResult<ForkliftOrderResp> LogisticsOrderList = forkliftOrderService.pageQueryForkliftWaybillOrder(param);
+        return BaseResult.success(LogisticsOrderList);
+    }
+
+    /**
+     * 分页查询铲车订单
      *
      * @param param
      * @return
@@ -63,9 +77,22 @@ public class ForkliftAppController {
      */
     @Operation(summary = "铲车取消接单", description = "铲车取消接单")
     @PostMapping("/cancelForkliftOrder")
-    public BaseResult<PageDataResult<ForkliftOrderResp>> cancelForkliftOrder(@RequestBody @Valid ForkliftOrderQueryParam param){
-        PageDataResult<ForkliftOrderResp> LogisticsOrderList = forkliftOrderService.cancelForkliftOrder(param);
-        return BaseResult.success(LogisticsOrderList);
+    public BaseResult<PageDataResult<ForkliftOrderResp>> cancelForkliftOrder(@RequestBody @Valid ForkliftOrderCancelParam param){
+        forkliftOrderService.cancelForkliftOrder(param);
+        return BaseResult.success();
+    }
+
+    /**
+     * 装载完成
+     *
+     * @param param
+     * @return
+     */
+    @Operation(summary = "装载完成", description = "装载完成")
+    @PostMapping("/loadingCompleted")
+    public BaseResult<PageDataResult<ForkliftOrderResp>> loadingCompleted(@RequestBody @Valid ForkliftOrderCancelParam param){
+        forkliftOrderService.loadingCompleted(param);
+        return BaseResult.success();
     }
 
 }

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

@@ -50,7 +50,7 @@ public class KwtForkliftWaybillOrder implements Serializable {
     private Integer loadingType;
 
     /**
-     * 是否为当前车辆（1已结单、5已完成）
+     * 状态（1接单，5-已接单、10-已装载）
      */
     private Integer status;
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/reponse/ForkliftOrderResp.java

@@ -1,11 +1,16 @@
 package com.sckw.transport.model.param.forklift.reponse;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.sckw.payment.api.model.dto.WalletVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author :chenXiaoFei
@@ -20,193 +25,188 @@ public class ForkliftOrderResp implements Serializable {
     private static final long serialVersionUID = -6153312023002477484L;
 
     /**
-     * 运单id
+     * 铲车订单主键id
      */
-    @Schema(description = "运单id")
+    @Schema(description = "铲车订单主键id")
     private Long id;
 
     /**
-     * 物流订单id
+     * 铲车订单编号
      */
-    @Schema(description = "物流订单id")
-    private String logisticsOrderId;
+    @Schema(description = "铲车订单编号")
+    private Long fOrderNo;
 
     /**
-     * 物流订单编号
-     */
-    @Schema(description = "物流订单编号")
-    private String logisticsOrderNo;
-    /**
-     * 运单编号
+     * 企业id
      */
-    @Schema(description = "运单编号")
-    private String waybillNo;
+    @Schema(description = "企业id")
+    private Long entId;
 
     /**
-     * 托运单位id
+     * 物流运单id
      */
-    @Schema(description = "托运单位id")
-    private String consignCompanyId;
+    @Schema(description = "物流运单id")
+    private Long wOrderId;
 
     /**
-     * 托运单位名称
+     * 物流订单id
      */
-    @Schema(description = "托运单位名称")
-    private String consignCompanyName;
+    @Schema(description = "物流订单id")
+    private Long lOrderId;
 
     /**
-     * 商品id
+     * 装载类型（0装载，1补货）
      */
-    @Schema(description = "商品id")
-    private String goodsId;
+    @Schema(description = "装载类型（0装载，1补货）")
+    private Integer loadingType;
 
     /**
-     * 商品名称
+     * 状态（1接单，5-已接单、10-已装载）
      */
-    @Schema(description = "商品名称")
-    private String goodsName;
+    @Schema(description = "状态（1接单，5-已接单、10-已装载）")
+    private Integer status;
 
     /**
-     * 任务量
+     * 装载员id
      */
-    @Schema(description = "任务量")
-    private BigDecimal taskNum;
+    @Schema(description = "装载员id")
+    private Long driverId;
 
     /**
-     * 皮重
+     * 装载员姓名
      */
-    @Schema(description = "皮重")
-    private BigDecimal tareAmount;
+    @Schema(description = "装载员姓名")
+    private String driverName;
 
     /**
-     * 毛重
+     * 装载员联系电话
      */
-    @Schema(description = "毛重")
-    private BigDecimal grossAmount;
+    @Schema(description = "装载员联系电话")
+    private String driverPhone;
 
     /**
-     * 装货净重
+     * 装载接单时间
      */
-    @Schema(description = "装货净化重")
-    private BigDecimal loadingNetWeight;
+    @Schema(description = "装载接单时间")
+    private Date acceptOrderTime;
 
     /**
-     * 卸货净重
+     * 装载完成时间
      */
-    @Schema(description = "卸货净重")
-    private BigDecimal unloadingNetWeight;
+    @Schema(description = "装载完成时间")
+    private Date finishTime;
 
     /**
-     * 法定载重
+     * 创建时间
      */
-    @Schema(description = "法定载重")
-    private BigDecimal legalLoad;
+    @Schema(description = "创建时间")
+    private Date createTime;
 
     /**
-     * 计费方式
+     * 更新时间
      */
-    @Schema(description = "计费方式")
-    private String chargeType;
+    @Schema(description = "更新时间")
+    private Date updateTime;
 
     /**
-     * 计费方式描述
+     * 创建人
      */
-    @Schema(description = "计费方式描述")
-    private String chargeTypeDesc;
+    @Schema(description = "创建人")
+    private Long createUser;
 
     /**
-     * 司机id
+     * 更新人
      */
-    @Schema(description = "司机id")
-    private Long driverId;
+    @Schema(description = "更新人")
+    private Long updateUser;
 
-    /**
-     * 司机id
-     */
-    @Schema(description = "司机id")
-    private String driverName;
 
     /**
-     * 司机电话
+     * 运单信息
      */
-    @Schema(description = "司机id")
-    private String driverPhone;
+    @Schema(description = "运单信息")
+    private WayBillOrderVo wayBillVo;
 
-    /**
-     * 装货地址
-     */
-    @Schema(description = "装货地址")
-    private String loadAddress;
 
-    /**
-     * 经度(装货地址)
-     */
-    @Schema(description = "经度(装货地址)")
-    private String loadLng;
+    public class WayBillOrderVo implements Serializable {
 
-    /**
-     * 纬度(装货地址)
-     */
-    @Schema(description = "纬度(装货地址)")
-    private String loadLat;
 
-    /**
-     * 卸货地址
-     */
+        @Serial
+        private static final long serialVersionUID = 6810301814510319609L;
 
-    @Schema(description = "卸货地址")
-    private String unloadAddress;
+        /**
+         * 运单ID
+         */
+        @Schema(description = "运单ID")
+        private Long wOrderId;
 
-    /**
-     * 经度(卸货地址)
-     */
-    @Schema(description = "经度(卸货地址)")
-    private String unloadLng;
+        /**
+         * 司机ID
+         */
+        @Schema(description = "司机ID")
+        private Long driverId;
 
-    /**
-     * 纬度(卸货地址)
-     */
-    @Schema(description = "经度(卸货地址)")
-    private String unloadLat;
+        /**
+         * 司机姓名
+         */
+        @Schema(description = "司机姓名")
+        private String driverName;
 
-    /**
-     * 装卸货之间距离
-     */
-    @Schema(description = "装卸货之间距离")
-    private String distanceKm;
+        /**
+         * 司机电话
+         */
+        @Schema(description = "司机电话")
+        private String driverPhone;
 
-    /**
-     * 派单时间
-     */
-    @Schema(description = "派单时间")
-    private String sendTime;
 
-    /**
-     * 派单人
-     */
-    @Schema(description = "派单人")
-    private String sendOperator;
+        /**
+         * 运单接单时间
+         */
+        @Schema(description = "运单接单时间")
+        private Date wayAcceptOrderTime;
 
-    /**
-     * 派单人电话
-     */
-    @Schema(description = "派单人电话")
-    private String sendPhone;
+        /**
+         * 商品名称
+         */
+        @Schema(description = "商品名称")
+        private String goodsName;
 
-    /**
-     * 状态
-     */
-    @Schema(description = "状态")
-    private Integer status;
+        /**
+         * 任务量
+         */
+        @Schema(description = "任务量")
+        private BigDecimal taskNum;
+
+        /**
+         * 皮重
+         */
+        @Schema(description = "皮重")
+        private BigDecimal tareAmount;
+
+        /**
+         * 车辆类型
+         */
+        @Schema(description = "车辆类型")
+        private String truckType;
+
+        /**
+         * 车辆轴数
+         */
+        @Schema(description = "车辆轴数")
+        private String carAxisName;
+
+
+        /**
+         * 采购企业id
+         */
+        @Schema(description = "采购企业id")
+        private Long entId;
+
+        /**
+         * 采购单位
+         */
+        @Schema(description = "采购单位")
+        private String firmName;
+    }
 
-    /**
-     * 状态描述
-     */
-    @Schema(description = "状态描述")
-    private String statusDesc;
-    /**
-     * 订单余量
-     */
-    @Schema(description = "订单余量")
-    private String orderSurplus;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/request/ForkliftOrderCancelParam.java

@@ -0,0 +1,42 @@
+package com.sckw.transport.model.param.forklift.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author :donglang
+ * @version :1.0
+ * @description :
+ * @create :2026-01-05 08:59:00
+ */
+@Data
+public class ForkliftOrderCancelParam implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 8601314159466179906L;
+
+    /**
+     * 铲车订单id
+     */
+    @NotNull(message = "铲车订单id不能为空")
+    @Schema(description = "铲车订单id")
+    private Long forkliftOrderId;
+
+    /**
+     * 经度
+     */
+    @Schema(description = "经度")
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    @Schema(description = "纬度")
+    private String lat;
+
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/forklift/request/ForkliftOrderQueryParam.java

@@ -2,6 +2,7 @@ package com.sckw.transport.model.param.forklift.request;
 
 import com.sckw.core.web.request.PageReq;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -20,10 +21,30 @@ public class ForkliftOrderQueryParam extends PageReq implements Serializable {
     private static final long serialVersionUID = 8601314159466179906L;
 
     /**
-     * 商品名称
+     * 司机id
+     */
+    @NotNull(message = "司机id不能为空，")
+    @Schema(description = "司机id")
+    private Long driverId;
+
+    /**
+     * 商品id
      */
     @Schema(description = "商品名称")
-    private Long goodsName;
+    private Long goodsId;
+
+    /**
+     * 搜索关键字
+     */
+    @Schema(description = "搜索关键字")
+    private String keyWords;
+
+    /**
+     * 状态
+     */
+    @NotNull(message = "状态不能为空，")
+    @Schema(description = "状态 （1-待接单，5-进行中，10-已装载）")
+    private Integer status;
 
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/ForkliftOrderService.java

@@ -2,6 +2,8 @@ package com.sckw.transport.service.app;
 
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
@@ -10,7 +12,9 @@ import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.transport.model.KwtForkliftWaybillOrder;
 import com.sckw.transport.model.KwtWaybillOrder;
+import com.sckw.transport.model.param.WaybillOrderLoadingParam;
 import com.sckw.transport.model.param.forklift.reponse.ForkliftOrderResp;
+import com.sckw.transport.model.param.forklift.request.ForkliftOrderCancelParam;
 import com.sckw.transport.model.param.forklift.request.ForkliftOrderQueryParam;
 import com.sckw.transport.model.param.forklift.request.ForkliftOrderTakingParam;
 import com.sckw.transport.repository.KwtForkliftWaybillOrderRepository;
@@ -18,6 +22,7 @@ import com.sckw.transport.repository.KwtWaybillOrderRepository;
 import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Service;
@@ -41,6 +46,8 @@ public class ForkliftOrderService {
 
     private final KwtForkliftWaybillOrderRepository forkliftWaybillOrderRepository;
 
+    @Autowired
+    WaybillOrderService waybillOrderService;
 
     // 注入RedisTemplate用于分布式锁
     @Resource
@@ -60,7 +67,7 @@ public class ForkliftOrderService {
      * @param param
      * @return
      */
-    public PageDataResult<ForkliftOrderResp> pageQueryForkliftOrder(ForkliftOrderQueryParam param) {
+    public PageDataResult<ForkliftOrderResp> pageQueryForkliftWaybillOrder(ForkliftOrderQueryParam param) {
         log.info("查询铲车司机的物流运单：{}", JSON.toJSONString(param));
         //查询到底装货点的运单
         Page<KwtWaybillOrder> pageByStatus = waybillOrderRepository.findPageByStatus(param.getPageNum(), param.getPageSize());
@@ -78,6 +85,41 @@ public class ForkliftOrderService {
         return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), forkliftOrderList);
     }
 
+
+    /**
+     * 分页查询铲车订单
+     * @param param
+     * @return
+     */
+    public PageDataResult<ForkliftOrderResp> pageQueryForkliftOrder(ForkliftOrderQueryParam param) {
+        log.info("查询铲车司机订单：{}", JSON.toJSONString(param));
+        LambdaQueryWrapper<KwtForkliftWaybillOrder> wrapper = Wrappers.<KwtForkliftWaybillOrder>lambdaQuery()
+                .eq(KwtForkliftWaybillOrder::getDriverId, param.getDriverId())
+                .orderByDesc(KwtForkliftWaybillOrder::getCreateTime)
+                .orderByDesc(KwtForkliftWaybillOrder::getId);
+        if (ForkliftStatusEnum.PENDING_ORDERS.getCode().equals(param.getStatus())) {
+            wrapper.eq(KwtForkliftWaybillOrder::getStatus, 1);
+        } else if (ForkliftStatusEnum.ORDER_TAKING.getCode().equals(param.getStatus())) {
+            wrapper.eq(KwtForkliftWaybillOrder::getStatus, 5);
+        } else if (ForkliftStatusEnum.COMPLETED.getCode().equals(param.getStatus())) {
+            wrapper.eq(KwtForkliftWaybillOrder::getStatus, 10);
+        }
+        Page<KwtForkliftWaybillOrder> pageByStatus = forkliftWaybillOrderRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        List<KwtForkliftWaybillOrder> records = pageByStatus.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            log.info("当前铲车司机无物流运单，铲车司机id:{}", param.getDriverId());
+            return PageDataResult.empty(param.getPageNum(), param.getPageSize());
+        }
+        List<ForkliftOrderResp> forkliftOrderList = new ArrayList<>();
+        for (KwtWaybillOrder record : records) {
+            ForkliftOrderResp forklift = new ForkliftOrderResp();
+            forklift.setDriverId(record.getDriverId());
+            forklift.setDriverName(record.getDriverName());
+            forkliftOrderList.add(forklift);
+        }
+        return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), forkliftOrderList);
+    }
+
     /**
      * 铲车接单
      * @param param
@@ -219,30 +261,42 @@ public class ForkliftOrderService {
         log.info("创建铲车订单成功，订单ID：{}", waybillOrder.getId());
     }
 
-
-
-
     /**
      * 铲车取消接单
      * @param param
      * @return
      */
-    public PageDataResult<ForkliftOrderResp> cancelForkliftOrder(ForkliftOrderQueryParam param) {
-        log.info("查询铲车司机的物流运单：{}", JSON.toJSONString(param));
-        //查询到底装货点的运单
-        Page<KwtWaybillOrder> pageByStatus = waybillOrderRepository.findPageByStatus(param.getPageNum(), param.getPageSize());
-        List<KwtWaybillOrder> records = pageByStatus.getRecords();
-        if (CollectionUtils.isEmpty(records)) {
-            return PageDataResult.empty(param.getPageNum(), param.getPageSize());
+    public void cancelForkliftOrder(ForkliftOrderCancelParam param) {
+        log.info("铲车司机取消订单：{}", JSON.toJSONString(param));
+        //查询铲车接单的订单
+        KwtForkliftWaybillOrder forkliftWaybillOrder = forkliftWaybillOrderRepository.getById(param.getForkliftOrderId());
+        if (forkliftWaybillOrder == null) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.FORKLIFT_ORDER_NOT_FOUND, "当前铲车订单不存在！");
         }
-        List<ForkliftOrderResp> forkliftOrderList = new ArrayList<>();
-        for (KwtWaybillOrder record : records) {
-            ForkliftOrderResp forklift = new ForkliftOrderResp();
-            forklift.setDriverId(record.getDriverId());
-            forklift.setDriverName(record.getDriverName());
-            forkliftOrderList.add(forklift);
+        forkliftWaybillOrder.setStatus(ForkliftStatusEnum.ORDER_CANCEL.getCode());
+        forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+    }
+
+    /**
+     * 装载完成
+     * @param param
+     * @return
+     */
+    public void loadingCompleted(ForkliftOrderCancelParam param) {
+        log.info("铲车司机装载完成：{}", JSON.toJSONString(param));
+        KwtForkliftWaybillOrder forkliftWaybillOrder = forkliftWaybillOrderRepository.getById(param.getForkliftOrderId());
+        if (forkliftWaybillOrder == null) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.FORKLIFT_ORDER_NOT_FOUND, "当前铲车订单不存在！");
         }
-        return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), forkliftOrderList);
+        forkliftWaybillOrder.setStatus(ForkliftStatusEnum.COMPLETED.getCode());
+        forkliftWaybillOrderRepository.updateById(forkliftWaybillOrder);
+
+        //更新物流运单的状态(已装货)
+        WaybillOrderLoadingParam loadingParam = new WaybillOrderLoadingParam();
+        loadingParam.setLng(param.getLng());
+        loadingParam.setLat(param.getLat());
+        loadingParam.setWaybillOrderId(forkliftWaybillOrder.getWOrderId());
+        waybillOrderService.loading(loadingParam);
     }
 
 

sql/2026/01/2026_01_06_donglang_create.sql

@@ -2,15 +2,16 @@
 create table kwt_forklift_waybill_order
 (
     id                              bigint          NOT NULL AUTO_INCREMENT COMMENT '主键',
-    f_order_no                      varchar(30)     NOT NULL DEFAULT '-1' COMMENT '编号',
+    f_order_no                      varchar(30)     NOT NULL DEFAULT '-1' COMMENT '铲车订单编号',
     ent_id                          bigint          NOT NULL DEFAULT '-1' COMMENT '企业id',
     w_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流运单id',
     l_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流订单id',
     loading_type                    int             NOT NULL DEFAULT '0' COMMENT '装载类型（0装载，1补货）',
-    status                          int             NOT NULL DEFAULT '0' COMMENT '是否为当前车辆（1已结单、5已完成）',
+    status                          int             NOT NULL DEFAULT '0' COMMENT '状态（1接单，5-已接单、10-已装载）',
     driver_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '装载员id',
-    driver_name                     varchar(40)     DEFAULT NULL default '' COMMENT '接单的装载员',
+    driver_name                     varchar(40)     DEFAULT NULL default '' COMMENT '装载员姓名',
     driver_phone                    varchar(20)     DEFAULT NULL default '' COMMENT '装载员联系电话',
+    accept_order_time                     datetime        NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '装载完成时间',
     finish_time                     datetime        NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '装载完成时间',
     create_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     update_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP COMMENT '更新时间',