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

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

@@ -358,6 +358,38 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
+
+
+    @ApiOperation(value = "查询运输订单对应的车牌以及车辆的状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTransportOrder")
+    public RESTfulResult getTransportOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                          Integer orderId,
+                                         Integer orderStatus
+    ) {
+        if (orderId!=null){
+            mapValue.put("orderId",orderId);
+        }
+        if (orderStatus!=null||!orderStatus.equals("")){
+            mapValue.put("orderStatus",orderStatus);
+        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = omstruckOrderService.getTransportOrder(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, capacity);
+        return success(pageList);
+    }
+
     @ApiOperation(value = "分解运输计划后 新增订单  或者直接新增订单 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
@@ -610,7 +642,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (con != null && con.length() != 0) {
             mapValue.put("con", "%" + con + "%");
         }
-        mapValue.put("carrierSsoId",carrierSsoId);
+        if (carrierSsoId != null && !carrierSsoId.equals("")) {
+            mapValue.put("carrierSsoId", carrierSsoId);
+        }
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -619,6 +653,32 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @PostMapping("/getDriverInfoForSale1")
+    public RESTfulResult getDriverInfoForSale1(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer orderStatus,
+                                               String con,
+                                               Integer saleOrderId,
+                                               String numberPlate
+    ) {
+        if (saleOrderId != null) {
+            mapValue.put("saleOrderId", saleOrderId);
+        }
+        if (orderStatus != null) {
+            mapValue.put("orderStatus", orderStatus);
+        }
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        if (numberPlate != null && !"".equals(numberPlate) && !"null".equals(numberPlate)) {
+            mapValue.put("numberPlate", "%" + numberPlate + "%");
+        }
+        List<Map<String, Object>> result = omstruckOrderService.selectTransportOrderForSale1(mapValue);
+        return success(result);
+    }
+
 
     @ApiOperation(value = "司机APP端调用接口查询数据 4 已下发 5 已接收")
     @ApiImplicitParams({
@@ -1142,4 +1202,35 @@ public class OmstruckOrderController extends BaseRESTfulController {
         List<Map<String, Object>> orderMaterialList = omstruckOrderMapper.getOrderMaterialList(new BigDecimal(orderId));
         return success(orderMaterialList);
     }
+
+    //销售物流接收订单，订单类型为已下发，司机接单状态为已下发，未下发。
+    @ApiOperation(value = "展示销售订单下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDriverInfoForSale2")
+    public RESTfulResult getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              BigDecimal saleOrderId,
+                                              String con
+    ) {
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        mapValue.put("saleOrderId",saleOrderId);
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.getDriverInfoForSale2(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
+        return success(pageList);
+    }
 }

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

@@ -144,6 +144,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
 
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
     //销售：根据承运商查找承运商
     List<Map<String, Object>> selectSaleMaterialIdByCarrierId(Integer carrierId);
 
@@ -336,4 +338,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal getLineSeq(BigDecimal orderId);
 
     String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 }

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

@@ -119,6 +119,8 @@ public interface IOmstruckOrderService {
     //销售：接收运输订单展示pc端界面
     List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
 
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
     //根据承运商查找销售订单
     List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map);
 
@@ -203,4 +205,6 @@ public interface IOmstruckOrderService {
 
     int refuseCtrlZ(Map<String, Object> map);
 
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> mapValue);
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
 }

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

@@ -9,7 +9,6 @@ import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
 import com.steerinfo.dil.util.DataChange;
-import com.sun.corba.se.spi.ior.ObjectKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -258,6 +258,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 8:
             case 17:
             case 18:
+                if (map.get("loadNameId")!=null) omstruckOrder.setDriverConfirmation(DataChange.dataToBigDecimal(map.get("loadNameId")));//装货点
                 if (map.get("purchaseOrderId") != null)  omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId"))); //订单ID
                 if (map.get("unloadPointId") != null)  omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));// 添加卸货点
                 break;
@@ -750,6 +751,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return omstruckOrderMapper.refuseCtrlZ(map);
     }
 
+    //获取运输订单对应的车牌以及车辆状态
+    @Override
+    public List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue) {
+        return omstruckOrderMapper.getTransportOrder(mapValue);
+    }
+
     /**
      * 销售物流，下发订单
      *
@@ -1090,9 +1097,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     @Override
     public List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map) {
-        String carrierSsoId = (String) map.get("carrierSsoId");
-        BigDecimal carrierId = omstruckOrderMapper.getCarrierIdBySSO(carrierSsoId);
-        map.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale(map);
         int count = 1;
         for (Map<String, Object> stringObjectMap : mapList) {
@@ -1102,6 +1106,17 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         return mapList;
     }
 
+    @Override
+    public List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map) {
+        List<Map<String, Object>> mapList = omstruckOrderMapper.selectTransportOrderForSale1(map);
+        int count = 1;
+        for (Map<String, Object> stringObjectMap : mapList) {
+            stringObjectMap.put("ROW_ID",count);
+            count ++;
+        }
+        return mapList;
+    }
+
     @Override
     public List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map) {
         return omstruckOrderMapper.selectSteelSaleForCarrier(map);
@@ -2111,4 +2126,75 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         return result;
     }
+
+    /**
+     * 查询销售订单下的运单信息
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map) {
+        List<Map<String, Object>> mapList = omstruckOrderMapper.getDriverInfoForSale2(map);
+        int count = 1;
+        String carStatus = null;
+        for (Map<String, Object> stringObjectMap : mapList) {
+            // 未接单
+            if (((BigDecimal)stringObjectMap.get("orderStatus")).intValue() == 4) {
+                carStatus = "未接单";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已出厂
+            if (stringObjectMap.get("outGateTime") != null) {
+                carStatus = "已出厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已计毛
+            if (stringObjectMap.get("grossWeight") != null) {
+                carStatus = "已计毛";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已装货
+            if (stringObjectMap.get("loadTime") != null) {
+                carStatus = "已装货";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已计皮
+            if (stringObjectMap.get("tareWeight") != null) {
+                carStatus = "已计皮";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已进厂
+            if (stringObjectMap.get("enGateTime") != null) {
+                carStatus = "已进厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 未进厂
+            if (stringObjectMap.get("enGateTime") == null) {
+                carStatus = "未进厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+        }
+        return mapList;
+    }
 }

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

@@ -790,6 +790,7 @@
                 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", --收货单位
@@ -814,6 +815,8 @@
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_WAREHOUSE RW
         on OO.UNLOAD_POINT_ID = RW.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2
+        ON OO.DRIVER_CONFIRMATION = RW2.WAREHOUSE_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
         left join RMS_CONSIGNEE RCSE
@@ -1825,7 +1828,10 @@
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
         OO.ORDER_ID "orderId",
-        RC3.CARRIER_NAME "carrierName"
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -1841,16 +1847,22 @@
         ON OO.CAPACITY_ID=RC.CAPACITY_ID
         LEFT JOIN RMS_SHIPPER RS
         ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
-        ON RRA.ADDRESS_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
-            <if test="carrierId!=null">
-                and RC3.CARRIER_ID = #{carrierId}
+            <if test="carrierSsoId!=null">
+                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
             </if>
             <if test="orderTypee!=null">
                 and OO.ORDER_TYPE = #{orderTypee}
@@ -1862,7 +1874,127 @@
         </where>
         ) RRC
         <if test="con != null">
-            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con}
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
+
+    <select id="selectTransportOrderForSale1" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT *from(
+        select
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN
+        ||RRP.ADDRESS_DELIVERY_ADDRESS "completeAddress",
+        ASOM.SALE_SHIPPING_ADDRESS_ID "addressId",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        ASM.SALE_MATERIAL_ID "saleMaterialId",
+        ASM.MATERIAL_ID "materialId",
+        ASTM.TRUCKNO_MATERIAL_ID "trucknoMaterialId",
+        OO.ORDER_ID "orderId",
+        ASM.STEEL_METER "meterNumber",
+        ASM.MATERIAL_NUMBER "orderPlanWeight",
+        ASM.IS_POUND_SALE "isPound",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "Specification",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        ASM.EAS_PRIMARY_ID "easId",
+        ASM.SALE_WAREHOUSE "warehouse",
+        ASM.MATERIAL_WEIGHT "materialWeight"
+        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_TRUCKNO_MATERIAL ASTM
+        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 AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        <where>
+            <if test="orderStatus!=null">
+                AND OO.ORDER_STATUS = #{orderStatus}
+            </if>
+
+            <if test="saleOrderId!=null">
+                AND ASO.SALE_ORDER_ID = #{saleOrderId}
+            </if>
+
+            <if test="numberPlate!=null">
+                AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
+            </if>
+
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
         </if>
         )
         <where>
@@ -2887,6 +3019,7 @@
                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
@@ -2899,6 +3032,8 @@
                            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
@@ -3666,4 +3801,59 @@
     <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
         select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}
     </select>
+
+    <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT OO.ORDER_NUMBER            AS "orderNumber",
+               RCC.CAPACITY_NUMBER        AS "capacityNumber",
+               TWR.RESULT_NET_WEIGHT      AS "netWeight",
+               TWR.RESULT_TARE_WEIGHT     AS "tareWeight",
+               TWR.RESULT_GROSS_WEIGHT    AS "grossWeight",
+               TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
+               TLFR.RESULT_OUT_GATE_TIME  AS "outGateTime",
+               TLR.RESULT_LOAD_START_TIME AS "loadTime",
+               RM.MATERIAL_NAME           AS "materialName",
+               OOM.ORDER_MATERIAL_WEIGHT  AS "materialWeight",
+               OO.ORDER_STATUS            AS "orderStatus"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 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 RMS_CAPACITY RCC
+                           ON RCC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                           ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+                           ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+          AND OO.ORDER_STATUS IS NOT NULL
+          AND OO.ORDER_TYPE IN (1,2)
+        <if test="con != null" >
+            AND RCC.CAPACITY_NUMBER LIKE #{con}
+        </if>
+        ORDER BY OO.ORDER_NUMBER DESC
+    </select>
+
+    <select id="getTransportOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select  OO.DRIVER_CONFIRMATION "loadName",
+                RC.CAPACITY_NUMBER   "capacityNumber",
+                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
+        where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
+    </select>
 </mapper>