'胡魁12/119点42分'

pom.xml

@@ -109,8 +109,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>AMSTRUCK_RAIL_DAYPLAN</param>
-                    <param>RMS_DRIVER_CAPACITY</param>
+<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>-->
+                    <param>OMSTRUCK_ORDER</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -1300,6 +1300,7 @@ OmstruckOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+
     @ApiOperation(value = "查询司机的所有运输订单信息")
     @PostMapping("/getAllOrderMessage")
     public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
@@ -1308,4 +1309,10 @@ OmstruckOrderController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "司机确认订单")
+    @PostMapping("/driverConfirmation")
+    public RESTfulResult driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        int result = omstruckOrderService.driverConfirmation(mapvalue);
+        return success(result);
+    }
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -32,6 +32,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过运输订单Id查询运输订单号
     String getOrderNumberByOrderId(Integer orderId);
 
+    //通过运输订单号查询运输订单ID
+    Integer getOrderIdByOrderNumber(String orderNumber);
+
     //查询所有运力信息
     List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
 

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -3,7 +3,6 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -58,9 +57,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderCommunicationDuration;
 
     /**
-     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收，7：逻辑删除(ORDER_STATUS,DECIMAL,38)
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8:关闭(ORDER_STATUS,DECIMAL,38)
      */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收，7：逻辑删除",required=false)
+    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8:关闭",required=false)
     private BigDecimal orderStatus;
 
     /**
@@ -135,6 +134,12 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="卸货点ID",required=false)
     private BigDecimal unloadPointId;
 
+    /**
+     * 司机确认订单（1：已确认）(DRIVER_CONFIRMATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机确认订单（1：已确认）",required=false)
+    private BigDecimal driverConfirmation;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -315,6 +320,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.unloadPointId = unloadPointId;
     }
 
+    public BigDecimal getDriverConfirmation() {
+        return driverConfirmation;
+    }
+
+    public void setDriverConfirmation(BigDecimal driverConfirmation) {
+        this.driverConfirmation = driverConfirmation;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -342,6 +355,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", orderEntryTime=").append(orderEntryTime);
         sb.append(", driverCapacityId=").append(driverCapacityId);
         sb.append(", unloadPointId=").append(unloadPointId);
+        sb.append(", driverConfirmation=").append(driverConfirmation);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -167,4 +167,6 @@ public interface IOmstruckOrderService {
 
     // 查询车牌下的所有运单信息
     List<Map<String, Object>> getAllOrderMessage(String capacityNumber);
+    //司机确认订单
+    int driverConfirmation(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1492,7 +1492,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     public List<Map<String, Object>> getAllOrderMessage(String capacityNumber) {
-        List<Map<String,Object>> resultList;
+        List<Map<String, Object>> resultList;
         // 判断是走采购，销售还是内转
         resultList = omstruckOrderMapper.getResultListByCapacity(capacityNumber);
         // 如果不是内转则取下面的orderId和orderType
@@ -1503,11 +1503,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             resultList = omstruckOrderMapper.getResultList(driverCapacityId);
         }
         // 循环遍历出每一条运输订单的信息
-        for (Map<String,Object> map : resultList) {
+        for (Map<String, Object> map : resultList) {
             BigDecimal orderId = (BigDecimal) map.get("orderId");
             BigDecimal orderType = (BigDecimal) map.get("orderType");
             // 查询物资信息
-            List<Map<String,Object>> materialMapList = omstruckOrderMapper.getMaterialMes(orderId);
+            List<Map<String, Object>> materialMapList = omstruckOrderMapper.getMaterialMes(orderId);
             String allMaterialName = "";
             String allMaterialNumber = "";
             String allMaterialWeight = "";
@@ -1515,10 +1515,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             // 对物资信息进行处理
             if (materialMapList == null && materialMapList.size() == 0) {
             } else {
-                for (Map<String,Object> materialMap : materialMapList) {
+                for (Map<String, Object> materialMap : materialMapList) {
                     String materialName = (String) materialMap.get("materialName");
-                    BigDecimal materialNumber =  (BigDecimal) materialMap.get("materialNumber");
-                    BigDecimal materialWeight =  (BigDecimal) materialMap.get("materialWeight");
+                    BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
+                    BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
                     String materialModel = (String) materialMap.get("materialModel");
                     String materialSpecification = (String) materialMap.get("materialSpecification");
                     if (materialName != null) {
@@ -1567,7 +1567,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 map.put("allMaterialWeight", subMaterialWeight);
                 map.put("allMaterialSpecificationModel", subMaterialSpecificationModel);
             }
-            Map<String,Object> orderMap = null;
+            Map<String, Object> orderMap = null;
             int intValue = orderType.intValue();
             if (intValue == 1 || intValue == 2 || intValue == 3) {
                 orderMap = omstruckOrderMapper.getSaleMap(orderId);
@@ -1585,6 +1585,21 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         return resultList;
     }
-
-
+    /**
+     * 司机确认订单
+     * orderNumber 运输订单号
+     * @param map
+     * @return
+     */
+    @Override
+    public int driverConfirmation(Map<String, Object> map) {
+        OmstruckOrder omstruckOrder = new OmstruckOrder();
+        //通过运输订单号查询运输订单Id
+        Integer orderId = omstruckOrderMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
+        omstruckOrder.setOrderId(new BigDecimal(orderId));
+        //设置司机确认订单
+        omstruckOrder.setDriverConfirmation(new BigDecimal(1));
+        omstruckOrder.setUpdateTime(new Date());
+        return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -2,50 +2,48 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.OmstruckOrderMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmstruckOrder">
-        <id column="ORDER_ID" jdbcType="DECIMAL" property="orderId"/>
-        <result column="ORDER_PLAN_ID" jdbcType="DECIMAL" property="orderPlanId"/>
-        <result column="ORDER_NUMBER" jdbcType="VARCHAR" property="orderNumber"/>
-        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId"/>
-        <result column="ORDER_ISSUE_TIME" jdbcType="TIMESTAMP" property="orderIssueTime"/>
-        <result column="ORDER_RECEIVE_STATUS" jdbcType="DECIMAL" property="orderReceiveStatus"/>
-        <result column="ORDER_RECEIVE_REFUSE_TIME" jdbcType="TIMESTAMP" property="orderReceiveRefuseTime"/>
-        <result column="ORDER_COMMUNICATION_DURATION" jdbcType="DECIMAL" property="orderCommunicationDuration"/>
-        <result column="ORDER_STATUS" jdbcType="DECIMAL" property="orderStatus"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
-        <result column="ORDER_TYPE" jdbcType="DECIMAL" property="orderType"/>
-        <result column="ORDER_LINE_SEQUENCE" jdbcType="DECIMAL" property="orderLineSequence"/>
-        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId"/>
-        <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime"/>
-        <result column="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId"/>
-        <result column="UNLOAD_POINT_ID" jdbcType="DECIMAL" property="unloadPointId"/>
+        <id column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
+        <result column="ORDER_PLAN_ID" jdbcType="DECIMAL" property="orderPlanId" />
+        <result column="ORDER_NUMBER" jdbcType="VARCHAR" property="orderNumber" />
+        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+        <result column="ORDER_ISSUE_TIME" jdbcType="TIMESTAMP" property="orderIssueTime" />
+        <result column="ORDER_RECEIVE_STATUS" jdbcType="DECIMAL" property="orderReceiveStatus" />
+        <result column="ORDER_RECEIVE_REFUSE_TIME" jdbcType="TIMESTAMP" property="orderReceiveRefuseTime" />
+        <result column="ORDER_COMMUNICATION_DURATION" jdbcType="DECIMAL" property="orderCommunicationDuration" />
+        <result column="ORDER_STATUS" jdbcType="DECIMAL" property="orderStatus" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="ORDER_TYPE" jdbcType="DECIMAL" property="orderType" />
+        <result column="ORDER_LINE_SEQUENCE" jdbcType="DECIMAL" property="orderLineSequence" />
+        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
+        <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime" />
+        <result column="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId" />
+        <result column="UNLOAD_POINT_ID" jdbcType="DECIMAL" property="unloadPointId" />
+        <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
     </resultMap>
     <sql id="columns">
-        ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
-    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
-    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID, UNLOAD_POINT_ID
+        ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS, 
+    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE, 
+    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID, UNLOAD_POINT_ID, 
+    DRIVER_CONFIRMATION
     </sql>
     <sql id="columns_alias">
-        t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
-    t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME,
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
-    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.DRIVER_CAPACITY_ID,
-    t.UNLOAD_POINT_ID
+        t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS, 
+    t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
+    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.DRIVER_CAPACITY_ID, 
+    t.UNLOAD_POINT_ID, t.DRIVER_CONFIRMATION
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM OMSTRUCK_ORDER
+        SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM OMSTRUCK_ORDER t
+        SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER t
     </sql>
     <sql id="where">
         <where>
@@ -112,6 +110,9 @@
             <if test="unloadPointId != null">
                 and UNLOAD_POINT_ID = #{unloadPointId}
             </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -179,11 +180,13 @@
             <if test="unloadPointId != null">
                 and UNLOAD_POINT_ID = #{unloadPointId}
             </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from OMSTRUCK_ORDER
+        delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -249,6 +252,9 @@
         <if test="unloadPointId != null">
             or UNLOAD_POINT_ID = #{unloadPointId}
         </if>
+        <if test="driverConfirmation != null">
+            or DRIVER_CONFIRMATION = #{driverConfirmation}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -258,17 +264,15 @@
                                     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                     DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
                                     LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID,
-                                    UNLOAD_POINT_ID)
+                                    UNLOAD_POINT_ID, DRIVER_CONFIRMATION)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
-                #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP},
-                #{orderReceiveStatus,jdbcType=DECIMAL},
+                #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
                 #{orderStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{driverCapacityId,jdbcType=DECIMAL},
-                #{unloadPointId,jdbcType=DECIMAL})
+                #{unloadPointId,jdbcType=DECIMAL}, #{driverConfirmation,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -336,6 +340,9 @@
             <if test="unloadPointId != null">
                 UNLOAD_POINT_ID,
             </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -401,30 +408,34 @@
             <if test="unloadPointId != null">
                 #{unloadPointId,jdbcType=DECIMAL},
             </if>
+            <if test="driverConfirmation != null">
+                #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         update OMSTRUCK_ORDER
-        set ORDER_PLAN_ID                = #{orderPlanId,jdbcType=DECIMAL},
-            ORDER_NUMBER                 = #{orderNumber,jdbcType=VARCHAR},
-            CAPACITY_ID                  = #{capacityId,jdbcType=DECIMAL},
-            ORDER_ISSUE_TIME             = #{orderIssueTime,jdbcType=TIMESTAMP},
-            ORDER_RECEIVE_STATUS         = #{orderReceiveStatus,jdbcType=DECIMAL},
-            ORDER_RECEIVE_REFUSE_TIME    = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+        set ORDER_PLAN_ID = #{orderPlanId,jdbcType=DECIMAL},
+            ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+            CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            ORDER_ISSUE_TIME = #{orderIssueTime,jdbcType=TIMESTAMP},
+            ORDER_RECEIVE_STATUS = #{orderReceiveStatus,jdbcType=DECIMAL},
+            ORDER_RECEIVE_REFUSE_TIME = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
             ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration,jdbcType=DECIMAL},
-            ORDER_STATUS                 = #{orderStatus,jdbcType=DECIMAL},
-            INSERT_USERNAME              = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME                  = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME              = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME                  = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK         = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED                      = #{deleted,jdbcType=DECIMAL},
-            ORDER_TYPE                   = #{orderType,jdbcType=DECIMAL},
-            ORDER_LINE_SEQUENCE          = #{orderLineSequence,jdbcType=DECIMAL},
-            LINE_ID                      = #{lineId,jdbcType=DECIMAL},
-            ORDER_ENTRY_TIME             = #{orderEntryTime,jdbcType=TIMESTAMP},
-            DRIVER_CAPACITY_ID           = #{driverCapacityId,jdbcType=DECIMAL},
-            UNLOAD_POINT_ID              = #{unloadPointId,jdbcType=DECIMAL}
+            ORDER_STATUS = #{orderStatus,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
+            ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
+            LINE_ID = #{lineId,jdbcType=DECIMAL},
+            ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL},
+            UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
+            DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -490,6 +501,9 @@
             <if test="unloadPointId != null">
                 UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
             </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
@@ -516,7 +530,8 @@
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
         LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_ID,
-        UNLOAD_POINT_ID)
+        UNLOAD_POINT_ID, DRIVER_CONFIRMATION
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -526,11 +541,10 @@
         #{item.orderStatus,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL},
-        #{item.orderLineSequence,jdbcType=DECIMAL},
-        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP},
-        #{item.driverCapacityId,jdbcType=DECIMAL},
-        #{item.unloadPointId,jdbcType=DECIMAL} from dual
+        #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL}, #{item.orderLineSequence,jdbcType=DECIMAL},
+        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.driverCapacityId,jdbcType=DECIMAL},
+        #{item.unloadPointId,jdbcType=DECIMAL}, #{item.driverConfirmation,jdbcType=DECIMAL}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -620,6 +634,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.unloadPointId,jdbcType=DECIMAL}
         </foreach>
+        ,DRIVER_CONFIRMATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_ID" close="end">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverConfirmation,jdbcType=DECIMAL}
+        </foreach>
         where ORDER_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.orderId,jdbcType=DECIMAL}
@@ -632,6 +650,7 @@
             #{id}
         </foreach>
     </delete>
+
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!--  根据插入时间排序  -->
@@ -1634,9 +1653,7 @@
                            on rce.consignee_id = aso.receive_id
                  left join rms_receive_address rca
                            on rca.address_id = asom.sale_shipping_address_id
-        where rdc.capacity_id = #{capacityId}
-          and oo.order_status = #{orderStatus}
-          and oo.order_type = #{orderType}
+        where oo.ORDER_ID = #{orderId}
     </select>
     <select id="getSaleTruckOrderByCapacityNumMaterial" resultType="java.util.Map">
         select rm.material_name          "materialName",
@@ -2780,4 +2797,11 @@
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
 AND OO.ORDER_STATUS = 4
     </select>
+
+<!--  通过运输订单号查询运输订单ID  -->
+    <select id="getOrderIdByOrderNumber" parameterType="string" resultType="java.lang.Integer">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>