Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -399,6 +399,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/addPurOrder")
     public RESTfulResult addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         int i = omstruckOrderService.addPurOrder(mapValue);
+        if (i==-1){
+            return  failed("抱歉系统没有找到您的组织，请联系自动化部");
+        }
         return success(i);
     }
 
@@ -1035,6 +1038,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/addInwardOrder")
     public RESTfulResult addInwardOrder(@RequestBody Map<String,Object> mapValue) {
         int result = omstruckOrderService.addInwardOrder(mapValue);
+        if (result==-1){
+            return failed("您的账号尚未绑定组织,请联系自动化部");
+        }
         return success(result);
     }
 

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

@@ -16,9 +16,9 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     private BigDecimal orderId;
 
     /**
-     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
+     * 车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
      */
-    @ApiModelProperty(value="销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
+    @ApiModelProperty(value="车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
     private BigDecimal orderPlanId;
 
     /**
@@ -165,6 +165,12 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="司机电话号码",required=false)
     private String driverTel;
 
+    /**
+     * 操作人员组织(OPTIONER_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="操作人员组织",required=false)
+    private String optionerCode;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -385,6 +391,14 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         this.driverTel = driverTel == null ? null : driverTel.trim();
     }
 
+    public String getOptionerCode() {
+        return optionerCode;
+    }
+
+    public void setOptionerCode(String optionerCode) {
+        this.optionerCode = optionerCode == null ? null : optionerCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -417,6 +431,7 @@ public class OmstruckOrder implements IBasePO<BigDecimal> {
         sb.append(", tripId=").append(tripId);
         sb.append(", orderPrintStatus=").append(orderPrintStatus);
         sb.append(", driverTel=").append(driverTel);
+        sb.append(", optionerCode=").append(optionerCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -170,6 +170,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             map.put("priceId",capacityMap.get("priceId"));
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
+            if (omstruckOrder.equals("")){
+                return -1;
+            }
             omstruckOrder.setOrderPlanId(purchaseOrderId);
             omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力ID
             omstruckOrder.setOrderEntryTime(orderEntryTime);
@@ -226,6 +229,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map) {
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
+        String orgCode =(String) map.get("orgCode");
+        if (orgCode!=null){
+           omstruckOrder.setOptionerCode(orgCode);
+        }else {
+            return null;
+        }
         //生成订单主键Id
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
         omstruckOrder.setOrderId(maxId);
@@ -637,10 +646,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public int addPurInwardOrder(Map<String, Object> mapValue) {
         int result = 0;
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
-
         BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId"));
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId"));
         BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
+        String orgCode =(String) mapValue.get("orgCode");
+        if (orgCode==null||orgCode.equals("")){
+            return -1;
+        }
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(planId);
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
@@ -672,6 +684,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setUpdateTime(new Date());
             omstruckOrder.setInsertUsername("admin");
             omstruckOrder.setUpdateUsername("admin");
+            omstruckOrder.setOptionerCode(orgCode);
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(orderType);
@@ -1490,6 +1503,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         List<Map<String,Object>> mapList = (List<Map<String, Object>>) mapValue.get("mapList");
         BigDecimal planId = DataChange.dataToBigDecimal(mapValue.get("planId")) ;
         BigDecimal lineId = DataChange.dataToBigDecimal(mapValue.get("lineId")) ;
+        String orgCode =(String) mapValue.get("orgCode");
+        if (orgCode==null||orgCode.equals("")){
+            return -1;
+        }
         orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
         String userId=(String) mapValue.get("userId");
         //根据计划查找需求，如果是计时，就添加新的订单类型
@@ -1528,6 +1545,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setOrderNumber(orderNumber);
             omstruckOrder.setOrderIssueTime(new Date());
             omstruckOrder.setOrderStatus(new BigDecimal(4));
+            omstruckOrder.setOptionerCode(orgCode);
             omstruckOrder.setCapacityId(capacityId);
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());

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

@@ -28,13 +28,14 @@
         <result column="TRIP_ID" jdbcType="VARCHAR" property="tripId" />
         <result column="ORDER_PRINT_STATUS" jdbcType="DECIMAL" property="orderPrintStatus" />
         <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
+        <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
     </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, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
-    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE
     </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,
@@ -42,7 +43,7 @@
     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.UNLOAD_POINT_ID,
     t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
-    t.DRIVER_TEL
+    t.DRIVER_TEL, t.OPTIONER_CODE
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
@@ -130,6 +131,9 @@
             <if test="driverTel != null and driverTel != ''">
                 and DRIVER_TEL = #{driverTel}
             </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE = #{optionerCode}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -212,9 +216,12 @@
             <if test="driverTel != null and driverTel != ''">
                 and DRIVER_TEL LIKE '%${driverTel}%'
             </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE LIKE '%${optionerCode}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
         delete from OMSTRUCK_ORDER
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </delete>
@@ -296,6 +303,9 @@
         <if test="driverTel != null and driverTel != ''">
             or DRIVER_TEL = #{driverTel}
         </if>
+        <if test="optionerCode != null and optionerCode != ''">
+            or OPTIONER_CODE = #{optionerCode}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
@@ -306,8 +316,8 @@
                                     DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
                                     LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
                                     DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
-                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL
-        )
+                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
+                                    OPTIONER_CODE)
         values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
                 #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
                 #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
@@ -316,8 +326,8 @@
                 #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
                 #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
                 #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
-                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR}
-               )
+                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
+                #{optionerCode,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
         insert into OMSTRUCK_ORDER
@@ -400,6 +410,9 @@
             <if test="driverTel != null">
                 DRIVER_TEL,
             </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -480,6 +493,9 @@
             <if test="driverTel != null">
                 #{driverTel,jdbcType=VARCHAR},
             </if>
+            <if test="optionerCode != null">
+                #{optionerCode,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -508,7 +524,8 @@
             CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
             TRIP_ID = #{tripId,jdbcType=VARCHAR},
             ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
-            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR}
+            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR}
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
@@ -589,10 +606,13 @@
             <if test="driverTel != null">
                 DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
             </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            </if>
         </set>
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
         <include refid="select" />
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
     </select>
@@ -617,7 +637,7 @@
         LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
         DRIVER_CONFIRMATION, PRICE_ID,
         CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
-        DRIVER_TEL)
+        DRIVER_TEL, OPTIONER_CODE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.orderId,jdbcType=DECIMAL},
@@ -631,7 +651,7 @@
         #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
         #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
         #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
-        #{item.driverTel,jdbcType=VARCHAR} from dual
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -741,6 +761,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
             when #{item.orderId,jdbcType=DECIMAL} then #{item.driverTel,jdbcType=VARCHAR}
         </foreach>
+        ,OPTIONER_CODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.optionerCode,jdbcType=VARCHAR}
+        </foreach>
         where ORDER_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.orderId,jdbcType=DECIMAL}
@@ -755,6 +779,7 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <!--  根据插入时间排序  -->
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">
@@ -772,29 +797,29 @@
         from
         (
         select
-                OO.ORDER_ID "orderId",
-                APO.PURCHASE_ORDER_ID "purchaseOrderId",
-                APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                APO.IS_MORE_TRIPS   "isMoreTrips",
-                RM.MATERIAL_NAME "materialName",
-            <if test="orderTypee == 8">
-                AP.PLAN_NO "planNo",
-                AP.PLAN_ID "planId",
-                to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
-                to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
-            </if>
-                RC.CAPACITY_NUMBER "capacityNumber",
-                RC.CAPACITY_ID "capacityId",
-                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                OO.INSERT_USERNAME "insertUsername",
-                OO.INSERT_TIME "insertTime",
-                OO.ORDER_NUMBER "orderNumber",
-                RW.WAREHOUSE_NAME "warehouseName", --卸货点
-                RW2.WAREHOUSE_NAME "loadName",
-                to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
-                RS.SUPPLIER_NAME "supplierName", --发货单位
-                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
-                OO.ORDER_ISSUE_TIME "orderIssueTime"
+        OO.ORDER_ID "orderId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        APO.IS_MORE_TRIPS   "isMoreTrips",
+        RM.MATERIAL_NAME "materialName",
+        <if test="orderTypee == 8">
+            AP.PLAN_NO "planNo",
+            AP.PLAN_ID "planId",
+            to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
+            to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
+        </if>
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_ID "capacityId",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.INSERT_USERNAME "insertUsername",
+        OO.INSERT_TIME "insertTime",
+        OO.ORDER_NUMBER "orderNumber",
+        RW.WAREHOUSE_NAME "warehouseName", --卸货点
+        RW2.WAREHOUSE_NAME "loadName",
+        to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
+        RS.SUPPLIER_NAME "supplierName", --发货单位
+        RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
+        OO.ORDER_ISSUE_TIME "orderIssueTime"
 
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
@@ -1423,11 +1448,11 @@
         to_char(APO.PUCHASE_ORDER_DELIVERY_DATE, 'yyyy-mm-dd') "puchaseOrderDeliveryDate",
         RM.MATERIAL_NAME "materialName",
         (
-            case when OOM.ORDER_MATERIAL_WEIGHT is not null
-              then OOM.ORDER_MATERIAL_WEIGHT
-              when OOM.ORDER_MATERIAL_WEIGHT is null
-              then OOM.ORDER_MATERIAL_NUMBER
-            end
+        case when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then OOM.ORDER_MATERIAL_WEIGHT
+        when OOM.ORDER_MATERIAL_WEIGHT is null
+        then OOM.ORDER_MATERIAL_NUMBER
+        end
         )    "orderMaterialWeight",
         OO.ORDER_ISSUE_TIME "orderIssueTime",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
@@ -1450,7 +1475,7 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         <if test="carrierSSOId != null">
             left join RMS_CARRIER RCA
-                on RCA.CARRIER_ID = OO.CARRIER_ID
+            on RCA.CARRIER_ID = OO.CARRIER_ID
         </if>
         <where>
             <choose>
@@ -1685,7 +1710,7 @@
                  left join RMS_CAPACITY RC
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_ID = #{orderId}
-                and rownum = 1
+          and rownum = 1
     </select>
 
 
@@ -1950,7 +1975,8 @@
         ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
         ASM.EAS_PRIMARY_ID "easId",
         ASM.SALE_WAREHOUSE "warehouse",
-        ASM.MATERIAL_WEIGHT "materialWeight"
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        TWR.RESULT_NET_WEIGHT "netWeight"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1958,6 +1984,11 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
         LEFT JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
@@ -2583,8 +2614,8 @@
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
                            ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                LEFT JOIN AMS_SALE_MATERIAL ASM
-            ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
@@ -2619,8 +2650,8 @@
     <select id="getUnloadPointId" parameterType="java.lang.String" resultType="DECIMAL">
         SELECT
             RW.WAREHOUSE_ID AS "wareHouseId"
-            FROM RMS_WAREHOUSE RW
-            WHERE RW.WAREHOUSE_NAME = #{unloadPoint}
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_NAME = #{unloadPoint}
     </select>
 
     <select id="getCapacityAndDriver" parameterType="java.util.Map" resultType="java.util.Map">
@@ -2790,7 +2821,7 @@
                OO.ORDER_TYPE AS "orderType"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_STATUS = 4
           AND OO.ORDER_TYPE NOT IN (4, 9, 10, 11)
           AND OO.CAPACITY_ID = #{capacityId}
@@ -2823,36 +2854,36 @@
     <!-- 物资信息 -->
     <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
         SELECT
-               RM.MATERIAL_NAME
-                <if test="steelJudge != null">
-                    || '   ' || RW.WAREHOUSE_NAME
-                </if>
-                "materialName",
-               RM.MATERIAL_ID   "materialId",
-               OOM.MATERIAL_PRIORITY "materialPriority",
-               CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
-               (case
-                    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  || '吨'
-                   end
-                   )
-                   AS                                                                   "weightNum",
-                (   SELECT
-                           LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
-                    FROM TMSTRUCK_WEIGHT_RESULT TWR
-                    JOIN TMSTRUCK_TOTAL_RESULT TTR
-                        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-                    WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
-                   )                                                                    "netWeight"
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        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  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 <if test="steelJudge != null">
-                     LEFT JOIN RMS_WAREHOUSE RW
-                           ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
-                 </if>
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
         WHERE ORDER_ID = #{orderId}
         ORDER BY RM.MATERIAL_NAME
     </select>
@@ -3012,32 +3043,32 @@
     <!--   查询采购运输订单给APP 5 6 7 8 -->
     <select id="getCGOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",
-               OO.ORDER_NUMBER    "orderNumber",
-               OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SUPPLIER_NAME   "shipperName",
-               RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
-               RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType",
-               RW2.WAREHOUSE_NAME "loadName",
-               (case when APO.PURCHASING_ORGANIZATION_ID = 1
-                     then '一厂'
-                     when APO.PURCHASING_ORGANIZATION_ID = 2
-                     then '二厂'
-               end) "organizationCode"
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RS.SUPPLIER_NAME   "shipperName",
+        RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
+        RW.WAREHOUSE_NAME  "unloadName",
+        OO.ORDER_TYPE      "orderType",
+        RW2.WAREHOUSE_NAME "loadName",
+        (case when APO.PURCHASING_ORGANIZATION_ID = 1
+        then '一厂'
+        when APO.PURCHASING_ORGANIZATION_ID = 2
+        then '二厂'
+        end) "organizationCode"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-                 LEFT JOIN AMS_PURCHASE_ORDER APO
-                           ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                 left join RMS_WAREHOUSE RW2
-                 ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
-                 LEFT JOIN RMS_SUPPLIER RS
-                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                 LEFT JOIN RMS_CONSIGNEE RCON
-                           ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCON
+        ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
@@ -3050,24 +3081,24 @@
         </if>
     </select>
 
-<!--查询采购零星物资信息给app 12 -->
+    <!--查询采购零星物资信息给app 12 -->
     <select id="getSporadicOrder" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT  OO.ORDER_ID        "orderId",
-                OO.ORDER_NUMBER    "orderNumber",
-                OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                OO.ORDER_TYPE      "orderType",
-                RS.SUPPLIER_NAME  "shipperName",
-                RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_TYPE      "orderType",
+        RS.SUPPLIER_NAME  "shipperName",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                 left join AMSTRUCK_SPORADIC_ORDER ASO
-                           ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
-                 LEFT JOIN RMS_SUPPLIER RS
-                           ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
-                 LEFT JOIN RMS_CONSIGNEE RC2
-                           ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
         WHERE OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
@@ -3129,30 +3160,30 @@
     <!--  查询发运计划运输订单给APP  2 3 4 -->
     <select id="getFYJHOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT OO.ORDER_ID        "orderId",
-               OO.ORDER_TYPE      "orderType",
-               OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
-               OO.ORDER_NUMBER    "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RS.SHIPPER_NAME    "loadName",
-               RW.WAREHOUSE_NAME  "unloadName"
+        OO.ORDER_TYPE      "orderType",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        OO.ORDER_NUMBER    "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        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_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.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_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
-                <if test="status == null">
-                    AND OO.ORDER_STATUS in (4, 5, 6)
-                </if>
-                <if test="status != null">
-                    AND OO.ORDER_STATUS = 2
-                </if>
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
     </select>
     <!--  查询销售运输订单给APP 1 -->
     <select id="getXSOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
@@ -3204,8 +3235,8 @@
         SELECT OO.ORDER_ID "orderId",
                OO.ORDER_TYPE  "orderType"
         FROM OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
           AND OO.ORDER_STATUS = 4
     </select>
@@ -3248,24 +3279,24 @@
 
     <select id="getOrderMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
         SELECT
-        OOM.MATERIAL_ID AS "materialId",
-               RM.MATERIAL_NAME AS "materialName",
-               OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
-               OOM.ORDER_MATERIAL_NUMBER AS "materialNumber",
-               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
+            OOM.MATERIAL_ID AS "materialId",
+            RM.MATERIAL_NAME AS "materialName",
+            OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+            OOM.ORDER_MATERIAL_NUMBER AS "materialNumber",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE OOM.ORDER_ID = #{orderId}
     </select>
 
     <select id="getSporadicOrderTimes" resultType="java.util.Map">
-         select aso.sporadic_order_times "orderTimes",
-                aso.SPORADIC_TRANS_TIMES "transTimes"
-         from OMSTRUCK_ORDER oo
-            left join  AMSTRUCK_SPORADIC_ORDER  aso
-            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
-            where oo.order_id= #{orderId}
+        select aso.sporadic_order_times "orderTimes",
+               aso.SPORADIC_TRANS_TIMES "transTimes"
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
     </select>
 
     <select id="getAllResultId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
@@ -3299,16 +3330,16 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-<!--  查看当前订单最大路段顺序号  -->
+    <!--  查看当前订单最大路段顺序号  -->
     <select id="getMaxLineSeqByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select OO.ORDER_LINE_SEQUENCE "orderLineSequence",
                (select max(RLS.SEGMENT_SQE)
-                    from RMS_LINE_SEGEMNT RLS
-                   where RLS.LINE_ID = RL.LINE_ID
+                from RMS_LINE_SEGEMNT RLS
+                where RLS.LINE_ID = RL.LINE_ID
                )    "segmentSqe"
         from OMSTRUCK_ORDER OO
-        join RMS_LINE RL
-            on RL.LINE_ID = OO.LINE_ID
+                 join RMS_LINE RL
+                      on RL.LINE_ID = OO.LINE_ID
         where OO.ORDER_ID = #{orderId}
     </select>
     <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
@@ -3316,9 +3347,9 @@
                aso.SPORADIC_ORDER_ID "sporadicOrderId",
                oo.CAPACITY_ID "capacityId",
                ASO.TRANS_STATUS "transStatus"
-            from OMSTRUCK_ORDER oo
-            left join  AMSTRUCK_SPORADIC_ORDER  aso
-            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
         where oo.order_id= #{orderId}
     </select>
 
@@ -3327,9 +3358,9 @@
         FROM RMS_LINE RL
         WHERE RL.LINE_ID = #{lineId}
     </select>
-<!--    采购内转运输订单-->
+    <!--    采购内转运输订单-->
     <select id="getPurInwardOrderList" resultType="java.util.Map">
-       SELECT * FROM (
+        SELECT * FROM (
         SELECT APO.PURCHASE_ORDER_NO      AS "purchaseOrderNo",
         RM.MATERIAL_NAME           AS "materialName",
         RCA.CARRIER_NAME           AS "carrierName",
@@ -3380,7 +3411,7 @@
         ORDER BY OO.INSERT_TIME DESC
         )
 
-       <where>
+        <where>
             <if test="orderNo != null">
                 <foreach collection="orderNo" item="item" open="(" separator="or" close=")">
                     "orderNo" like '%${item}%'
@@ -3438,24 +3469,24 @@
         delete from TMSTRUCK_WEIGHT_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
-<!-- 删除装车实绩   -->
+    <!-- 删除装车实绩   -->
     <delete id="deleteLoadResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_LOAD_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
 
-<!--  删除出厂实绩-->
+    <!--  删除出厂实绩-->
     <delete id="deleteLeaveResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_LEAVE_FACTORY_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
 
-<!--删除卸货实绩-->
+    <!--删除卸货实绩-->
     <delete id="deleteUnloadResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_UNLOAD_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
-<!--删除进厂实绩-->
+    <!--删除进厂实绩-->
     <delete id="deleteEnResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_ENFACTORY_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
@@ -3467,57 +3498,57 @@
     <!--根据订单id查询运输订单信息-->
     <select id="selectOrderMap" resultType="java.util.Map" parameterType="DECIMAL">
         select oo.order_plan_id "planId",
-        oo.capacity_id   "capacityId",
-        oo.order_type    "orderType",
-        oo.line_id       "lineId",
-        oom.material_id  "materialId"
+               oo.capacity_id   "capacityId",
+               oo.order_type    "orderType",
+               oo.line_id       "lineId",
+               oom.material_id  "materialId"
         from omstruck_order oo
-        left join omstruck_order_material oom
-        on oom.order_id = oo.order_id
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
         where oo.order_id = #{orderId}
     </select>
 
-<!--  通过定向派单ID查询车序号表中的priceId  -->
+    <!--  通过定向派单ID查询车序号表中的priceId  -->
     <select id="getPriceIdByDispatchId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
         select ASOM.PRICE_ID
         from AMS_DISPATCH_SALE_ORDER ADSO
-        left join AMS_SALE_ORDER_MATERIAL ASOM
-            on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
         where ADSO.DISPATCH_ID  = #{dispatchId}
     </select>
     <select id="getInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT OO.ORDER_ID            "orderId",
-               OO.ORDER_NUMBER        "orderNumber",
-               OO.ORDER_LINE_SEQUENCE "orderLineSequence",
-               RC.CAPACITY_NUMBER     "capacityNumber",
-               OO.ORDER_TYPE          "orderType",
-               OO.ORDER_STATUS        "orderStatus",
-               RS.SHIPPER_NAME        "shipperUnitName",
-               AIR.REQUIREMENT_ID     "requirementId",
-               AIR.DUE_DATE             "saleDateOfReceipt",
-               AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
-               RW1.WAREHOUSE_NAME       "shipperName",
-               RW1.WAREHOUSE_NAME       "loadName",
-               RW.WAREHOUSE_NAME        "unloadName",
-               RW.WAREHOUSE_NAME        "consigneeCompanyName"
-              FROM OMSTRUCK_ORDER OO
-              LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
-              ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
-              LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-              ON ARP.PLAN_ID = AIP.PLAN_ID
-              LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-              ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-              LEFT JOIN RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
-                           ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
-                 LEFT JOIN RMS_WAREHOUSE RW1
-                           ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
-         where oo.order_id = #{orderId}
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -3528,20 +3559,20 @@
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
     </select>
-<!-- 根据运输订单id查找需求日期 -->
- <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
-    select AIR.DUE_DATE  "dueTime",
-           OO.ORDER_TYPE "orderType",
-           aip.PLAN_EABLE_STATUS "planEnableStatus"
-    from OMSTRUCK_ORDER OO
-    left join AMSTRUCK_INWARD_PLAN AIP
-    on AIP.PLAN_ID=OO.ORDER_PLAN_ID
-    left join AMSTRUCK_REQUIREMENT_PLAN ARP
-    on ARP.PLAN_ID=AIP.PLAN_ID
-    left join AMSTRUCK_INWARD_REQUIREMENT AIR
-    on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
-    where OO.ORDER_ID=#{orderId}
-   </select>
+    <!-- 根据运输订单id查找需求日期 -->
+    <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select AIR.DUE_DATE  "dueTime",
+               OO.ORDER_TYPE "orderType",
+               aip.PLAN_EABLE_STATUS "planEnableStatus"
+        from OMSTRUCK_ORDER OO
+                 left join AMSTRUCK_INWARD_PLAN AIP
+                           on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 left join AMSTRUCK_REQUIREMENT_PLAN ARP
+                           on ARP.PLAN_ID=AIP.PLAN_ID
+                 left join AMSTRUCK_INWARD_REQUIREMENT AIR
+                           on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
     <select id="getTimeTaskEndDetail" resultType="java.util.Map" parameterType="java.util.Map">
         select RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",
@@ -3664,23 +3695,23 @@
     </select>
     <select id="getPauseTimeTaskDetail" resultType="java.util.Map" parameterType="java.lang.Integer">
         select  (
-                     SELECT TTTR2.RESULT_TIME
-                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
-                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-                       AND TTTR2.RESULT_TIME_TYPE = 1
-                 ) "startTime",
-                 (
-                     SELECT TTTR2.RESULT_TIME
-                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
-                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-                       AND TTTR2.RESULT_TIME_TYPE = 3
-                 ) "endTime",
-                 (
-                     SELECT TTTR2.RESULT_VALUE
-                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
-                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-                       AND TTTR2.RESULT_TIME_TYPE = 3
-                 ) "totalTime",
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 1
+                ) "startTime",
+                (
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "endTime",
+                (
+                    SELECT TTTR2.RESULT_VALUE
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "totalTime",
                 (
                     SELECT TTTR2.RESULT_VALUE
                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
@@ -3688,33 +3719,33 @@
                       AND TTTR2.RESULT_TIME_TYPE = 7
                 ) "pauseTime"
         from OMSTRUCK_ORDER OO
-        left join TMSTRUCK_TOTAL_RESULT TTR
-        ON OO.ORDER_ID=TTR.ORDER_ID
-        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
-        ON TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID=TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
         WHERE  OO.ORDER_ID = #{orderId}
     </select>
 
     <select id="getInwardOrderMessage" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT
-            OO.ORDER_NUMBER "orderNumber",
-            RC.CAPACITY_NUMBER "capacityNumber",
-            OO.ORDER_ID "orderId",
-            ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
-            ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
-            ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
-            ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
-            RM.MATERIAL_NAME "materialName"
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
+        ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+        ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
+        ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+        RM.MATERIAL_NAME "materialName"
         FROM
-            OMSTRUCK_ORDER OO
-                LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
-                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
-                LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-                LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
+        OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
-            OO.ORDER_ID = #{orderId}
+        OO.ORDER_ID = #{orderId}
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -3728,9 +3759,9 @@
     <select id="getTimeTaskByTotalId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
         select COUNT(*)
         from TMSTRUCK_TOTAL_RESULT TTR
-        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
-        ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
-      WHERE TTR.RESULT_TOTAL_ID=#{resultTotalId} and TTTR.RESULT_TIME_TYPE=1
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+        WHERE TTR.RESULT_TOTAL_ID=#{resultTotalId} and TTTR.RESULT_TIME_TYPE=1
     </select>
 
     <select id="getSteelOrderMessageToApp" parameterType="map" resultType="map">
@@ -3774,22 +3805,22 @@
     <select id="getLoadForLoadCarResult" resultType="java.util.Map" parameterType="java.util.Map">
         select *
         from(select
-        COUNT(RC.CAPACITY_NUMBER) "number",
-        sum(TWR.RESULT_NET_WEIGHT) "netWeight",
-        TLR.CAPACITY_REMARK "LoaderCapacityNumber"
-        from OMSTRUCK_ORDER OO
-        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-        ON TTR.ORDER_ID=OO.ORDER_ID
-        LEFT JOIN RMS_CAPACITY RC
-        ON RC.CAPACITY_ID=OO.CAPACITY_ID
-        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
-        ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
-        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
-        where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
-        and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
-        GROUP BY TLR.CAPACITY_REMARK
-        )
+                 COUNT(RC.CAPACITY_NUMBER) "number",
+                 sum(TWR.RESULT_NET_WEIGHT) "netWeight",
+                 TLR.CAPACITY_REMARK "LoaderCapacityNumber"
+             from OMSTRUCK_ORDER OO
+                      LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                ON TTR.ORDER_ID=OO.ORDER_ID
+                      LEFT JOIN RMS_CAPACITY RC
+                                ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                      LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                                ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                      LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                                ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+             where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
+               and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+             GROUP BY TLR.CAPACITY_REMARK
+            )
     </select>
 
     <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >
@@ -3852,8 +3883,10 @@
                 OO.ORDER_NUMBER  "orderNumber",
                 OO.ORDER_RECEIVE_REFUSE_TIME "receiveTime"
         from OMSTRUCK_ORDER OO
-        LEFT JOIN RMS_CAPACITY RC
-        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID=RC.CAPACITY_ID
         where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
     </select>
+
+
 </mapper>