运输司机app创建铲车和门卫数据

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/ComeIntoHandler.java

@@ -2,20 +2,18 @@ package com.sckw.transport.handler;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
-import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
+import com.sckw.core.model.enums.ForkliftStatusEnum;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.DateUtils;
 import com.sckw.fleet.api.model.vo.DriverConductRulesVO;
 import com.sckw.fleet.api.model.vo.RTruckVo;
 import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
-import com.sckw.transport.model.KwtWaybillOrder;
-import com.sckw.transport.model.KwtWaybillOrderNode;
-import com.sckw.transport.model.KwtWaybillOrderTicket;
+import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.WaybillOrderCmeIntoWeighParam;
+import com.sckw.transport.repository.KwtForkliftWaybillOrderRepository;
 import com.sckw.transport.repository.KwtWaybillOrderTicketRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -41,6 +40,9 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
     @Autowired
     private KwtWaybillOrderTicketRepository waybillOrderTicketRepository;
 
+    @Autowired
+    private KwtForkliftWaybillOrderRepository forkliftWaybillOrderRepository;
+
 
     @Override
     protected KwtWaybillOrder getWaybillOrder(WaybillOrderCmeIntoWeighParam param) {
@@ -72,6 +74,48 @@ public class ComeIntoHandler extends AbstractWaybillOrderHandler<WaybillOrderCme
             truckNo.setTareWeight(param.getTareAmount());
             remoteFleetService.updateTruckTareAmount(truckNo);
         }
+        //3. 创建铲车记录
+        createForkliftWaybill(waybillOrder);
+    }
+
+    /**
+     * 创建铲车记录
+     * @param waybillOrder
+     */
+    private void createForkliftWaybill(KwtWaybillOrder waybillOrder) {
+        CompletableFuture.runAsync(() ->{
+            try {
+                log.debug("开始异步保存铲车司机数据，运单ID:{}", waybillOrder.getId());
+
+                KwtForkliftWaybillOrder forklift = new KwtForkliftWaybillOrder();
+                forklift.setFOrderNo("F" + System.currentTimeMillis());
+                forklift.setEntId(waybillOrder.getEntId());
+                forklift.setWOrderId(waybillOrder.getId());
+                forklift.setLOrderId(waybillOrder.getLOrderId());
+                forklift.setLoadingType(0);
+                forklift.setStatus(ForkliftStatusEnum.PENDING_ORDERS.getCode());
+                forklift.setDriverId(waybillOrder.getDriverId());
+                forklift.setDriverName(waybillOrder.getDriverName());
+                forklift.setDriverPhone(waybillOrder.getDriverPhone());
+                forklift.setWaybillAcceptTime(waybillOrder.getCreateTime());
+                // 任务量
+                KwtWaybillOrderSubtask waybillSubtask = getWaybillSubtask(waybillOrder.getId());
+                forklift.setEntrustAmount(waybillSubtask.getEntrustAmount());
+                // 车辆类型
+                RTruckVo truckVo = remoteFleetService.findTruckByTruckNo(waybillOrder.getTruckNo());
+                if (truckVo != null) {
+                    forklift.setTruckType(truckVo.getTruckType());
+                    forklift.setCarAxis(truckVo.getCarAxis());
+                }
+                forklift.setCreateUser(waybillOrder.getDriverId());
+                forklift.setUpdateUser(waybillOrder.getDriverId());
+
+                forkliftWaybillOrderRepository.save(forklift);
+                log.debug("铲车司机数据保存成功");
+            } catch (Exception e) {
+                log.error("异步保存铲车司机数据失败！");
+            }
+        });
     }
 
     @Override

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -6,25 +6,28 @@ import com.google.common.collect.Lists;
 import com.sckw.core.common.enums.enums.ErrorCodeEnum;
 import com.sckw.core.exception.BusinessPlatfromException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.enums.AddressTypeEnum;
-import com.sckw.core.model.enums.CarWaybillV1Enum;
-import com.sckw.core.model.enums.DispatchWayEnums;
-import com.sckw.core.model.enums.LogisticsOrderV1Enum;
+import com.sckw.core.model.enums.*;
 import com.sckw.core.utils.CollectionUtils;
-import com.sckw.fleet.api.model.vo.*;
+import com.sckw.fleet.api.model.vo.RDriverScoreVo;
+import com.sckw.fleet.api.model.vo.RDriverVo;
+import com.sckw.fleet.api.model.vo.RTruckVo;
+import com.sckw.fleet.api.model.vo.TruckDispatchCoefficientVO;
 import com.sckw.order.api.model.OrderDetailVo;
 import com.sckw.order.api.model.UpdateActualAmountParam;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.param.OrderCirculateTakingQueryParam;
 import com.sckw.transport.model.param.OrderTakingResp;
+import com.sckw.transport.repository.KwtGatekeeperWaybillOrderRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -39,6 +42,10 @@ import java.util.stream.Collectors;
 @Service
 public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCirculateTakingQueryParam> {
 
+
+    @Autowired
+    private KwtGatekeeperWaybillOrderRepository gatekeeperWaybillOrderRepository;
+
     // 定义常量
     private static final BigDecimal EIGHTY_PERCENT = new BigDecimal("0.8");
     private static final BigDecimal TWO_TONS = new BigDecimal("2");
@@ -115,11 +122,47 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         //7、绑定车辆
         driverBindTruck(waybillOrder);
 
+        //8、生成门卫订单
+        createGatekeeperWaybillOrder(waybillOrder, truck, truckLoadVolume);
+
         BusinessContext.set("createdWaybillOrder", waybillOrder);
 
         log.info("物流订单接单完成，运单ID：{}", waybillOrder.getId());
     }
 
+    /**
+     * 创建门卫订单
+     *
+     * @param waybillOrder
+     * @param truckLoadVolume
+     */
+    private void createGatekeeperWaybillOrder(KwtWaybillOrder waybillOrder, RTruckVo truck, BigDecimal truckLoadVolume) {
+        KwtGatekeeperWaybillOrder gatekeeper = new KwtGatekeeperWaybillOrder();
+        gatekeeper.setEntId(waybillOrder.getEntId());
+        gatekeeper.setWOrderId(waybillOrder.getId());
+        gatekeeper.setLOrderId(waybillOrder.getLOrderId());
+        gatekeeper.setGoodId(11111L);
+        gatekeeper.setGoodsName("测试");
+        gatekeeper.setStatus(GatekeeperStatusEnum.PENDING_ENTRY.getCode());
+        gatekeeper.setWaybillAcceptTime(waybillOrder.getCreateTime());
+        gatekeeper.setEntrustAmount(truckLoadVolume);
+        gatekeeper.setTruckType(truck.getTruckType());
+        gatekeeper.setCarAxis(truck.getCarAxis());
+        gatekeeper.setLegalLoad(truck.getLegalLoad());
+        gatekeeper.setCreateUser(waybillOrder.getDriverId());
+        gatekeeper.setUpdateUser(waybillOrder.getDriverId());
+
+        CompletableFuture.runAsync(() -> {
+            try {
+                log.debug("开始异步保存门卫订单数据，运单ID:{}", waybillOrder.getId());
+                gatekeeperWaybillOrderRepository.save(gatekeeper);
+                log.debug("门卫订单数据保存成功");
+            } catch (Exception e) {
+                log.error("异步保存门卫订单数据失败！");
+            }
+        });
+    }
+
     @Override
     protected void calculateAutoDispatchScore(OrderCirculateTakingQueryParam param, KwtWaybillOrder waybillOrder) {
 

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -50,7 +51,7 @@ public class KwtForkliftWaybillOrder implements Serializable {
     private Integer loadingType;
 
     /**
-     * 状态（1接单，5-已接单、10-已装载）
+     * 状态（1-待接单，5-已接单、10-已装载）
      */
     private Integer status;
 
@@ -84,6 +85,11 @@ public class KwtForkliftWaybillOrder implements Serializable {
      */
     private Date waybillAcceptTime;
 
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
     /**
      * 车辆类型
      */

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

@@ -78,6 +78,11 @@ public class KwtGatekeeperWaybillOrder implements Serializable {
      */
     private String truckType;
 
+    /**
+     * 已委托量
+     */
+    private BigDecimal entrustAmount;
+
     /**
      * 车辆轴数
      */

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

@@ -65,48 +65,56 @@ public class ForkliftOrderResp implements Serializable {
     /**
      * 购买企业id
      */
+    @Schema(description = "购买企业id")
     private Long prEntId;
 
     /**
      * 购买企业名称
      */
+    @Schema(description = "购买企业名称")
     private String prEntName;
 
     /**
      * 运输司机车牌主键id
      */
+    @Schema(description = "运输司机车牌主键id")
     private Long truckId;
 
     /**
      * 运输司机车牌号
      */
+    @Schema(description = "运输司机车牌号")
     private String truckNo;
 
     /**
      * 运输司机姓名
      */
+    @Schema(description = "运输司机姓名")
     private String name ;
 
     /**
      * 运输司机电话
      */
+    @Schema(description = "运输司机电话")
     private String phone;
 
     /**
      * 商品id
      */
+    @Schema(description = "商品id")
     private Long goodsId;
 
     /**
      * 商品名称
      */
+    @Schema(description = "商品名称")
     private String goodsName;
 
     /**
      * 任务量
      */
     @Schema(description = "任务量")
-    private BigDecimal taskNum;
+    private BigDecimal entrustAmount;
 
     /**
      * 皮重

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

@@ -50,64 +50,71 @@ public class GatekeeperOrderResp implements Serializable {
     @Schema(description = "物流订单id")
     private Long lOrderId;
 
-
-
     /**
      * 状态（1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）
      */
-    @Schema(description = "状态 （1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）")
+    @Schema(description = "状态（1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）")
     private Integer status;
 
     /**
      * 购买企业id
      */
+    @Schema(description = "购买企业id")
     private Long prEntId;
 
     /**
      * 购买企业名称
      */
+    @Schema(description = "购买企业名称")
     private String prEntName;
 
     /**
      * 运输司机车牌主键id
      */
+    @Schema(description = "运输司机车牌主键id")
     private Long truckId;
 
     /**
      * 运输司机车牌号
      */
+    @Schema(description = "运输司机车牌号")
     private String truckNo;
 
     /**
      * 运输司机姓名
      */
+    @Schema(description = "运输司机姓名")
     private String name ;
 
     /**
      * 运输司机电话
      */
+    @Schema(description = "运输司机电话")
     private String phone;
 
     /**
      * 运输司机身份证号
      */
+    @Schema(description = "运输司机身份证号")
     private String idCard;
 
     /**
      * 商品id
      */
+    @Schema(description = "商品id")
     private Long goodsId;
 
     /**
      * 商品名称
      */
+    @Schema(description = "商品名称")
     private String goodsName;
 
     /**
      * 任务量
      */
     @Schema(description = "任务量")
-    private BigDecimal taskNum;
+    private BigDecimal entrustAmount;
 
     /**
      * 皮重

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

@@ -133,16 +133,7 @@ public class ForkliftOrderService {
         }
         Map<Long, KwtWaybillOrder> waybillOrderMap = waybillOrders.stream()
                 .collect(Collectors.toMap(KwtWaybillOrder::getId, Function.identity(), (x, y) -> x));
-
-        //查询子运单
-        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = waybillOrderSubtaskRepository.findOneByWOrderIds(wOrderIds);
-        if (CollectionUtils.isEmpty(waybillOrderSubtasks)) {
-            log.info("【铲车】无物流子运单信息，运单id:{}", JSON.toJSONString(wOrderIds));
-            return Collections.emptyList();
-        }
-        Map<Long, KwtWaybillOrderSubtask> subtaskMap = waybillOrderSubtasks.stream()
-                .collect(Collectors.toMap(KwtWaybillOrderSubtask::getWOrderId, Function.identity(), (x, y) -> x));
-        Set<Long> lOrderIds = waybillOrderSubtasks.stream().map(KwtWaybillOrderSubtask::getLOrderId).collect(Collectors.toSet());
+        Set<Long> lOrderIds = waybillOrders.stream().map(KwtWaybillOrder::getLOrderId).collect(Collectors.toSet());
 
         //查询运单装卸货
         List<KwtWaybillOrderTicket> waybillOrderTickets = waybillOrderTicketRepository.queryByWOrderIds(new ArrayList<>(wOrderIds));
@@ -190,7 +181,7 @@ public class ForkliftOrderService {
 
         //组装铲车订单数据
         return records.stream()
-                .map(forkliftOrder -> buildForkliftOrderResp(forkliftOrder, waybillOrderMap, subtaskMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrderGoodsMap, goodsIdAndGoodsMap, dictValueAndDictResDtoMap, tradeOrderAndUnit))
+                .map(forkliftOrder -> buildForkliftOrderResp(forkliftOrder, waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrderGoodsMap, goodsIdAndGoodsMap, dictValueAndDictResDtoMap, tradeOrderAndUnit))
                 .collect(Collectors.toList());
     }
 
@@ -199,12 +190,10 @@ public class ForkliftOrderService {
      * 组装铲车订单信息
      * @param forkliftOrder
      * @param waybillOrderMap
-     * @param subtaskMap
      * @return
      */
     private ForkliftOrderResp buildForkliftOrderResp(KwtForkliftWaybillOrder forkliftOrder,
                                                      Map<Long, KwtWaybillOrder> waybillOrderMap,
-                                                     Map<Long, KwtWaybillOrderSubtask> subtaskMap,
                                                      Map<String, KwtWaybillOrderTicket> waybillOrderTicketMap,
                                                      Map<Long, KwtLogisticsOrder> logisticsOrderMap,
                                                      Map<Long, KwtLogisticsOrderGoods> logisticsOrderGoodsMap,
@@ -228,6 +217,7 @@ public class ForkliftOrderService {
         forklift.setWaybillAcceptTime(forkliftOrder.getWaybillAcceptTime());
         forklift.setCarAxisName(forkliftOrder.getCarAxis());
         forklift.setTruckType(forkliftOrder.getTruckType());
+        forklift.setEntrustAmount(forkliftOrder.getEntrustAmount());
 
         //运单数据
         KwtWaybillOrder waybillOrder = waybillOrderMap.getOrDefault(forkliftOrder.getWOrderId(), new KwtWaybillOrder());
@@ -236,11 +226,6 @@ public class ForkliftOrderService {
         forklift.setName(waybillOrder.getDriverName());
         forklift.setPhone(waybillOrder.getDriverPhone());
 
-
-        //子运单数据
-        KwtWaybillOrderSubtask subtask = subtaskMap.getOrDefault(forkliftOrder.getWOrderId(), new KwtWaybillOrderSubtask());
-        forklift.setTaskNum(subtask.getEntrustAmount());
-
         //采购企业信息
         KwtLogisticsOrder logisticsOrder = logisticsOrderMap.getOrDefault(waybillOrder.getLOrderId(), new KwtLogisticsOrder());
         OrderUnitInfoDetailVO orderUnit = tradeOrderAndUnit.getOrDefault(logisticsOrder.getTOrderId() + "-" + 1, new OrderUnitInfoDetailVO());

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

@@ -136,16 +136,7 @@ public class GatekeeperOrderService {
         }
         Map<Long, KwtWaybillOrder> waybillOrderMap = waybillOrders.stream()
                 .collect(Collectors.toMap(KwtWaybillOrder::getId, Function.identity(), (x, y) -> x));
-
-        //查询子运单
-        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = waybillOrderSubtaskRepository.findOneByWOrderIds(wOrderIds);
-        if (CollectionUtils.isEmpty(waybillOrderSubtasks)) {
-            log.info("【门卫】无物流子运单信息，运单id:{}", JSON.toJSONString(wOrderIds));
-            return Collections.emptyList();
-        }
-        Map<Long, KwtWaybillOrderSubtask> subtaskMap = waybillOrderSubtasks.stream()
-                .collect(Collectors.toMap(KwtWaybillOrderSubtask::getWOrderId, Function.identity(), (x, y) -> x));
-        Set<Long> lOrderIds = waybillOrderSubtasks.stream().map(KwtWaybillOrderSubtask::getLOrderId).collect(Collectors.toSet());
+        Set<Long> lOrderIds = waybillOrders.stream().map(KwtWaybillOrder::getLOrderId).collect(Collectors.toSet());
 
         //查询运单装卸货
         List<KwtWaybillOrderTicket> waybillOrderTickets = waybillOrderTicketRepository.queryByWOrderIds(new ArrayList<>(wOrderIds));
@@ -193,7 +184,7 @@ public class GatekeeperOrderService {
 
         //组装铲车订单数据
         return records.stream()
-                .map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder, waybillOrderMap, subtaskMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrderGoodsMap, goodsIdAndGoodsMap, dictValueAndDictResDtoMap, tradeOrderAndUnit))
+                .map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder, waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrderGoodsMap, goodsIdAndGoodsMap, dictValueAndDictResDtoMap, tradeOrderAndUnit))
                 .collect(Collectors.toList());
     }
 
@@ -201,12 +192,11 @@ public class GatekeeperOrderService {
      * 组装门卫订单信息
      * @param gatekeeperWaybillOrder
      * @param waybillOrderMap
-     * @param subtaskMap
+
      * @return
      */
     private GatekeeperOrderResp buildGatekeeperOrderResp(KwtGatekeeperWaybillOrder gatekeeperWaybillOrder,
                                                      Map<Long, KwtWaybillOrder> waybillOrderMap,
-                                                     Map<Long, KwtWaybillOrderSubtask> subtaskMap,
                                                      Map<String, KwtWaybillOrderTicket> waybillOrderTicketMap,
                                                      Map<Long, KwtLogisticsOrder> logisticsOrderMap,
                                                      Map<Long, KwtLogisticsOrderGoods> logisticsOrderGoodsMap,
@@ -226,6 +216,7 @@ public class GatekeeperOrderService {
         gatekeeper.setIntoTime(gatekeeperWaybillOrder.getIntoTime());
         gatekeeper.setLeaveTime(gatekeeperWaybillOrder.getLeaveTime());
         gatekeeper.setWaybillAcceptTime(gatekeeperWaybillOrder.getWaybillAcceptTime());
+        gatekeeper.setEntrustAmount(gatekeeperWaybillOrder.getEntrustAmount());
 
         //运单数据
         KwtWaybillOrder waybillOrder = waybillOrderMap.getOrDefault(gatekeeperWaybillOrder.getWOrderId(), new KwtWaybillOrder());
@@ -235,10 +226,6 @@ public class GatekeeperOrderService {
         gatekeeper.setPhone(waybillOrder.getDriverPhone());
         gatekeeper.setIdCard(waybillOrder.getDriverIdcard());
 
-        //子运单数据
-        KwtWaybillOrderSubtask subtask = subtaskMap.getOrDefault(gatekeeperWaybillOrder.getWOrderId(), new KwtWaybillOrderSubtask());
-        gatekeeper.setTaskNum(subtask.getEntrustAmount());
-
         //采购企业信息
         KwtLogisticsOrder logisticsOrder = logisticsOrderMap.getOrDefault(waybillOrder.getLOrderId(), new KwtLogisticsOrder());
         OrderUnitInfoDetailVO orderUnit = tradeOrderAndUnit.getOrDefault(logisticsOrder.getTOrderId() + "-" + 1, new OrderUnitInfoDetailVO());

sql/2026/01/2026_01_06_donglang_create.sql

@@ -1,5 +1,5 @@
 
-create table kwt_forklift_waybill_order
+CREATE table kwt_forklift_waybill_order
 (
     id                              bigint          NOT NULL AUTO_INCREMENT COMMENT '主键',
     f_order_no                      varchar(30)     NOT NULL DEFAULT '-1' COMMENT '铲车订单编号',
@@ -7,19 +7,20 @@ create table kwt_forklift_waybill_order
     w_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流运单id',
     l_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流订单id',
     good_id                         bigint          NOT NULL DEFAULT '-1' COMMENT '商品id',
-    goods_name                      varchar(20)     NOT NULL NULL default '' COMMENT '商品名称',
+    goods_name                      varchar(20)     NOT NULL default '' COMMENT '商品名称',
     loading_type                    int             NOT NULL DEFAULT '0' COMMENT '装载类型（0装载，1补货）',
     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_phone                    varchar(20)     DEFAULT NULL default '' COMMENT '装载员联系电话',
-    forklift_accept_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 '装载完成时间',
+    driver_name                     varchar(40)     DEFAULT '' COMMENT '装载员姓名',
+    driver_phone                    varchar(20)     DEFAULT '' COMMENT '装载员联系电话',
+    forklift_accept_time            datetime        DEFAULT NULL COMMENT '装载接单时间',
+    finish_time                     datetime        DEFAULT NULL COMMENT '装载完成时间',
     waybill_accept_time             datetime        NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '运单接单时间',
-    truck_type                      varchar(5)      DEFAULT NULL default '' COMMENT '车辆类型',
-    carAxis                         varchar(5)      DEFAULT NULL default '' COMMENT '车辆轴数',
+    entrust_amount                  decimal(10,6)   DEFAULT NULL COMMENT '任务量',
+    truck_type                      varchar(5)      NOT NULL DEFAULT '' COMMENT '车辆类型',
+    carAxis                         varchar(5)      NOT NULL DEFAULT '' COMMENT '车辆轴数',
     create_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    update_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP COMMENT '更新时间',
+    update_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     create_user                     bigint          NOT NULL DEFAULT '-1' COMMENT '创建人',
     update_user                     bigint          NOT NULL DEFAULT '-1' COMMENT '更新人',
 
@@ -28,6 +29,9 @@ create table kwt_forklift_waybill_order
 
 
 
+
+
+
 create table kwt_gatekeeper_waybill_order
 (
     id                              bigint          NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -35,13 +39,14 @@ create table kwt_gatekeeper_waybill_order
     w_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流运单id',
     l_order_id                      bigint          NOT NULL DEFAULT '-1' COMMENT '物流订单id',
     good_id                         bigint          NOT NULL DEFAULT '-1' COMMENT '商品id',
-    goods_name                      varchar(20)     NOT NULL NULL default '' COMMENT '商品名称',
+    goods_name                      varchar(20)     NOT NULL default '' COMMENT '商品名称',
     status                          int             NOT NULL DEFAULT '0' COMMENT '状态（1-待进场，5-已进场、10-待离场、15-空载待离场、20-已放行未离场、25-已离场、30-空载离场）',
     into_time                       datetime        NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '进场时间',
     leave_time                      datetime        DEFAULT NULL COMMENT '离场时间',
     waybill_accept_time             datetime        NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '运单接单时间',
-    truck_type                      varchar(5)      DEFAULT NULL default '' COMMENT '车辆类型',
-    carAxis                         varchar(5)      DEFAULT NULL default '' COMMENT '车辆轴数',
+    entrust_amount                  decimal(10,6)   DEFAULT NULL COMMENT '任务量',
+    truck_type                      varchar(5)      NOT NULL default '' COMMENT '车辆类型',
+    carAxis                         varchar(5)      NOT NULL default '' COMMENT '车辆轴数',
     legal_load                      decimal(10,2)   DEFAULT NULL COMMENT '法定载重',
     create_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     update_time                     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP COMMENT '更新时间',