'销售bug'

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

@@ -1109,11 +1109,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         omstruckOrder.setDeleted(new BigDecimal(0));
         omstruckOrder.setOrderType(new BigDecimal(orderType));
         BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
-        BigDecimal driverCapacityId = omstruckOrderMapper.getDriverCapacityId(capacityId);
-        omstruckOrder.setDriverCapacityId(driverCapacityId);
-        RmsDriverCapacity rmsDriverCapacity = rmsDriverCapacityMapper.selectByPrimaryKey(driverCapacityId);
-        rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
-        rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
+        omstruckOrder.setCapacityId(capacityId);
+//        omstruckOrder.setCarrierId();
+//        BigDecimal driverCapacityId = omstruckOrderMapper.getDriverCapacityId(capacityId);
+//        omstruckOrder.setDriverCapacityId(driverCapacityId);
+//        RmsDriverCapacity rmsDriverCapacity = rmsDriverCapacityMapper.selectByPrimaryKey(driverCapacityId);
+//        rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
+//        rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
         List<Map<String, Object>> mapList = omstruckOrderMapper.getMaterialMessages(new BigDecimal(dispatchId));
         if (mapList != null && mapList.size() != 0) {
             for (Map<String, Object> map : mapList) {

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

@@ -2,28 +2,28 @@
 <!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" />
-        <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
+        <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, 
@@ -40,10 +40,14 @@
     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>
@@ -186,7 +190,8 @@
         </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">
@@ -266,10 +271,12 @@
                                     LINE_ID, ORDER_ENTRY_TIME, DRIVER_CAPACITY_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}, #{driverConfirmation,jdbcType=DECIMAL})
@@ -415,27 +422,27 @@
     </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},
-            DRIVER_CONFIRMATION = #{driverConfirmation,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">
@@ -541,8 +548,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.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> )
@@ -974,14 +983,14 @@
         select *
         from (
         select OO.ORDER_NUMBER "orderNumber",
-                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
-                RW.WAREHOUSE_NAME "warehouseName",
-                RM.MATERIAL_NAME "materialName",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                RW2.WAREHOUSE_NAME "warehouseName2",
-                OO.INSERT_UPDATE_REMARK "insertUpdateRemark",
-                TTR.RESULT_TOTAL_ID "resultTotalId"
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RW.WAREHOUSE_NAME "warehouseName",
+        RM.MATERIAL_NAME "materialName",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RW2.WAREHOUSE_NAME "warehouseName2",
+        OO.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        TTR.RESULT_TOTAL_ID "resultTotalId"
         from OMSTRUCK_ORDER OO
         left join RMS_DRIVER_CAPACITY RDC on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC on RC.CAPACITY_ID = RDC.CAPACITY_ID
@@ -2380,13 +2389,10 @@
     <select id="getCapacityAndDriver" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (SELECT RC.CAPACITY_NUMBER AS "capacityNumber",
-        RCD.DRIVER_NAME AS "driverName"
-        FROM RMS_DRIVER_CAPACITY RDC
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = RDC.CAPACITY_ID
-        LEFT JOIN RMS_CAR_DRIVER RCD
-        ON RDC.DRIVER_ID = RCD.DRIVER_ID
+        RC.CAPACITY_ID AS "carrierId"
+        FROM RMS_CAPACITY RC
         WHERE RC.CAPACITY_STATUS = 0
+            AND RC.CAPACITY_TYPE_ID = 1
         )
         <where>
             <if test="capacityNumber != null">
@@ -2395,12 +2401,6 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="driverName != null">
-                and
-                <foreach collection="driverName" item="item" open="(" separator="or" close=")">
-                    "driverName" like '%${item}%'
-                </foreach>
-            </if>
         </where>
     </select>
 
@@ -2632,17 +2632,16 @@
 
     <!-- 物资信息 -->
     <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT
-                RM.MATERIAL_NAME    "materialName",
-               CONCAT(CONCAT(RM.MATERIAL_MODEL,'(' ), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        SELECT RM.MATERIAL_NAME                                                            "materialName",
+               CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
                (case
-                   when OOM.ORDER_MATERIAL_WEIGHT is not null
-                          then OOM.ORDER_MATERIAL_WEIGHT
-                        when OOM.ORDER_MATERIAL_NUMBER is not null
-                             then OOM.ORDER_MATERIAL_NUMBER
+                    when OOM.ORDER_MATERIAL_WEIGHT is not null
+                        then OOM.ORDER_MATERIAL_WEIGHT
+                    when OOM.ORDER_MATERIAL_NUMBER is not null
+                        then OOM.ORDER_MATERIAL_NUMBER
                    end
                    )
-                AS "weightNum"
+                   AS                                                                      "weightNum"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
@@ -2801,24 +2800,24 @@
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
-AND OO.ORDER_STATUS = 4
+          AND OO.ORDER_STATUS = 4
     </select>
 
-<!--  通过运输订单号查询运输订单ID  -->
+    <!--  通过运输订单号查询运输订单ID  -->
     <select id="getOrderIdByOrderNumber" parameterType="string" resultType="java.lang.Integer">
         select OO.ORDER_ID
         from OMSTRUCK_ORDER OO
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
-<!--   查询采购运输订单给APP 5 6 7 8 -->
+    <!--   查询采购运输订单给APP 5 6 7 8 -->
     <select id="getCGOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID     "orderId",
-               OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER       "capacityNumber",
-               RS.SUPPLIER_NAME         "loadName",
-               RW.WAREHOUSE_NAME        "unloadName",
-               OO.ORDER_TYPE            "orderType"
+        SELECT OO.ORDER_ID        "orderId",
+               OO.ORDER_NUMBER    "orderNumber",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RS.SUPPLIER_NAME   "loadName",
+               RW.WAREHOUSE_NAME  "unloadName",
+               OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
@@ -2835,68 +2834,68 @@ AND OO.ORDER_STATUS = 4
 
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID  "orderId",
-               OO.ORDER_NUMBER  "orderNumber",
-               RC.CAPACITY_NUMBER       "capacityNumber",
-               RS.SUPPLIER_NAME         "loadName",
-               RW.WAREHOUSE_NAME        "unloadName",
-               OO.ORDER_TYPE            "orderType"
+        SELECT OO.ORDER_ID        "orderId",
+               OO.ORDER_NUMBER    "orderNumber",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RS.SUPPLIER_NAME   "loadName",
+               RW.WAREHOUSE_NAME  "unloadName",
+               OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-            ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-            ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-        LEFT JOIN AMS_PURCHASE_ORDER APO
-            ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-        LEFT JOIN RMS_SUPPLIER  RS
-            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-        LEFT JOIN RMS_WAREHOUSE RW
-            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-        LEFT JOIN RMS_DRIVER_CAPACITY RDC
-            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-        LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
 
     </select>
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID  "orderId",
-               OO.ORDER_TYPE    "orderType",
-               OO.ORDER_NUMBER  "orderNumber",
+        SELECT OO.ORDER_ID        "orderId",
+               OO.ORDER_TYPE      "orderType",
+               OO.ORDER_NUMBER    "orderNumber",
                RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SHIPPER_NAME  "loadName",
-               RW.WAREHOUSE_NAME    "unloadName"
+               RS.SHIPPER_NAME    "loadName",
+               RW.WAREHOUSE_NAME  "unloadName"
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-        LEFT JOIN AMS_SALE_ORDER  ASO
-            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-        LEFT JOIN RMS_SHIPPER RS
-            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-        LEFT JOIN RMS_WAREHOUSE RW
-            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-        LEFT JOIN RMS_DRIVER_CAPACITY RDC
-            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-        LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-        SELECT OO.ORDER_ID  "orderId",
-               OO.ORDER_TYPE    "orderType",
-               OO.ORDER_NUMBER  "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SHIPPER_NAME  "shipperName",
-               ASOM.SALE_DATE_OF_RECEIPT   "saleDateOfReceipt",
+        SELECT OO.ORDER_ID                   "orderId",
+               OO.ORDER_TYPE                 "orderType",
+               OO.ORDER_NUMBER               "orderNumber",
+               RC.CAPACITY_NUMBER            "capacityNumber",
+               RS.SHIPPER_NAME               "shipperName",
+               ASOM.SALE_DATE_OF_RECEIPT     "saleDateOfReceipt",
                RC2.CONSIGNEE_COMPANY_NAME    "consigneeCompanyName",
                RC2.CONSIGNEE_RECEIVE_ADDRESS "consigneeReceiveAddress"
 
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-                 LEFT JOIN AMS_SALE_ORDER  ASO
+                 LEFT JOIN AMS_SALE_ORDER ASO
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
@@ -2909,22 +2908,22 @@ AND OO.ORDER_STATUS = 4
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
-<!--  通过运输订单号查询订单类型  -->
+    <!--  通过运输订单号查询订单类型  -->
     <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
         SELECT OO.ORDER_TYPE
         FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
-<!--  通过车牌匹配所有已下发的 的订单Id -->
+    <!--  通过车牌匹配所有已下发的 的订单Id -->
     <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="int">
-        SELECT
-               OO.ORDER_ID
+        SELECT OO.ORDER_ID
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_DRIVER_CAPACITY RDC
-            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-        LEFT JOIN RMS_CAPACITY RC
-            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
-        WHERE RC.CAPACITY_NUMBER = #{capacityNumber} AND OO.ORDER_STATUS = 4
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 4
     </select>
 </mapper>