司机接单查询sql

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

@@ -1300,6 +1300,15 @@ OmstruckOrderController extends BaseRESTfulController {
         return success(result);
     }
 
+
+    @ApiOperation(value = "查询司机的所有运输订单信息")
+    @PostMapping("/getAllOrderMessage")
+    public List<Map<String,Object>> getAllOrderMessage(@RequestParam String capacityNumber) {
+        List<Map<String,Object>> mapList = omstruckOrderService.getAllOrderMessage(capacityNumber);
+        return mapList;
+    }
+
+
     @ApiOperation(value = "司机确认订单")
     @PostMapping("/driverConfirmation")
     public RESTfulResult driverConfirmation(@RequestBody(required = false) Map<String,Object> mapvalue) {
@@ -1310,6 +1319,13 @@ OmstruckOrderController extends BaseRESTfulController {
     @ApiOperation(value = "通过运输订单号查询订单信息给司机")
     @PostMapping("/getMessageToApp")
     public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
-        return omstruckOrderService.getMessageToApp(mapvalue);
+        BigDecimal orderId = DataChange.dataToBigDecimal(mapvalue.get("orderId"));
+        return omstruckOrderService.getMessageToApp(orderId);
+    }
+
+    @ApiOperation(value = "通过车牌号查询所有已下发未接收的订单信息")
+    @PostMapping("/getAllOrderMessagesByCapacityNum")
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        return omstruckOrderService.getAllOrderMessagesByCapacityNum(mapvalue);
     }
 }

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

@@ -197,6 +197,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     Map<String, Object> getInwardOrderMap(BigDecimal orderId);
 
+    //通过订单Id查询该订单下所有的物资
     List<Map<String,Object>> getMaterialMes(BigDecimal orderId);
 
     //根据运输订单查询车牌号
@@ -222,5 +223,18 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过运输订单号查询运输订单类型
     Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
 
+    //通过车牌号查询该车牌下所有已下发 未接收 的 订单Id （4）
+    List<Integer> getOrderIdListByCapacityNumber(String capacityNumber);
+
+    // 销售中的运输订单
+    Map<String, Object> getSaleMap(BigDecimal orderId);
+    // 内转钢材的运输订单
+    Map<String, Object> getSteelInwardMap(BigDecimal orderId);
+    // 采购的运输订单
+    Map<String, Object> getPurchaseMap(BigDecimal orderId);
+    // 内转的运输订单
+    Map<String, Object> getInwardMap(BigDecimal orderId);
+    // 判断是走采购，销售还是内转
+    List<Map<String, Object>> getResultListByCapacity(String capacityNumber);
 
 }

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

@@ -165,9 +165,16 @@ public interface IOmstruckOrderService {
 
     int apportionInwardOffsetOrder(Map<String, Object> mapList);
 
+    // 查询车牌下的所有运单信息
+    List<Map<String, Object>> getAllOrderMessage(String capacityNumber);
+
     //司机确认订单
     int driverConfirmation(Map<String, Object> map);
 
     //通过运输订单号查询订单信息给司机
-    Map<String, Object> getMessageToApp(Map<String, Object> map);
+    Map<String, Object> getMessageToApp(BigDecimal orderId);
+
+    //通过车牌号查询所有已下发未接收的订单信息
+    List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map);
+
 }

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

@@ -1485,6 +1485,106 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     }
 
+    /**
+     * 查询运单下的所有信息
+     * @param capacityNumber
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllOrderMessage(String capacityNumber) {
+        List<Map<String, Object>> resultList;
+        // 判断是走采购，销售还是内转
+        resultList = omstruckOrderMapper.getResultListByCapacity(capacityNumber);
+        // 如果不是内转则取下面的orderId和orderType
+        if (resultList == null || resultList.size() == 0) {
+            //通过车牌号匹配运力ID
+            BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByCapacityNum(capacityNumber);
+            BigDecimal driverCapacityId = omstruckOrderMapper.getDriverCapacityId(capacityId);
+            resultList = omstruckOrderMapper.getResultList(driverCapacityId);
+        }
+        // 循环遍历出每一条运输订单的信息
+        for (Map<String, Object> map : resultList) {
+            BigDecimal orderId = (BigDecimal) map.get("orderId");
+            BigDecimal orderType = (BigDecimal) map.get("orderType");
+            // 查询物资信息
+            List<Map<String, Object>> materialMapList = omstruckOrderMapper.getMaterialMes(orderId);
+            String allMaterialName = "";
+            String allMaterialNumber = "";
+            String allMaterialWeight = "";
+            String allMaterialSpecificationModel = "";
+            // 对物资信息进行处理
+            if (materialMapList == null && materialMapList.size() == 0) {
+            } else {
+                for (Map<String, Object> materialMap : materialMapList) {
+                    String materialName = (String) materialMap.get("materialName");
+                    BigDecimal materialNumber = (BigDecimal) materialMap.get("materialNumber");
+                    BigDecimal materialWeight = (BigDecimal) materialMap.get("materialWeight");
+                    String materialModel = (String) materialMap.get("materialModel");
+                    String materialSpecification = (String) materialMap.get("materialSpecification");
+                    if (materialName != null) {
+                        allMaterialName += materialName + "/";
+                    }
+                    if (materialNumber != null) {
+                        allMaterialNumber += materialNumber.toString() + "/";
+                    }
+                    if (materialWeight != null) {
+                        allMaterialWeight += materialWeight.toString() + "/";
+                    }
+                    if (materialSpecification != null || materialModel != null) {
+                        allMaterialSpecificationModel += materialSpecification + materialModel + "/";
+                    }
+                }
+                String subMaterialName = "";
+                String subMaterialNumber = "";
+                String subMaterialWeight = "";
+                String subMaterialSpecificationModel = "";
+                if (allMaterialName.length() >= 2) {
+                    subMaterialName = allMaterialName.substring(0, allMaterialName.length() - 2);
+                }
+                if (allMaterialName.length() < 2) {
+                    subMaterialName = allMaterialName;
+                }
+                if (allMaterialNumber.length() >= 2) {
+                    subMaterialNumber = allMaterialNumber.substring(0, allMaterialNumber.length() - 1);
+                }
+                if (allMaterialNumber.length() < 2) {
+                    subMaterialNumber = allMaterialNumber;
+                }
+                if (allMaterialWeight.length() >= 2) {
+                    subMaterialWeight = allMaterialWeight.substring(0, allMaterialWeight.length() - 1);
+                }
+                if (allMaterialWeight.length() < 2) {
+                    subMaterialWeight = allMaterialWeight;
+                }
+                if (allMaterialSpecificationModel.length() >= 2) {
+                    subMaterialSpecificationModel = allMaterialSpecificationModel.substring(0, allMaterialSpecificationModel.length() - 2);
+                }
+                if (allMaterialSpecificationModel.length() < 2) {
+                    subMaterialSpecificationModel = allMaterialSpecificationModel;
+                }
+                map.put("allMaterialName", subMaterialName);
+                map.put("allMaterialNumber", subMaterialNumber);
+                map.put("allMaterialWeight", subMaterialWeight);
+                map.put("allMaterialSpecificationModel", subMaterialSpecificationModel);
+            }
+            Map<String, Object> orderMap = null;
+            int intValue = orderType.intValue();
+            if (intValue == 1 || intValue == 2 || intValue == 3) {
+                orderMap = omstruckOrderMapper.getSaleMap(orderId);
+            }
+            if (intValue == 4) {
+                orderMap = omstruckOrderMapper.getSteelInwardMap(orderId);
+            }
+            if (intValue == 5 || intValue == 6 || intValue == 7 || intValue == 8) {
+                orderMap = omstruckOrderMapper.getPurchaseMap(orderId);
+            }
+            if (intValue == 9 || intValue == 10 || intValue == 11) {
+                orderMap = omstruckOrderMapper.getInwardMap(orderId);
+            }
+            map.putAll(orderMap);
+        }
+        return resultList;
+    }
     /**
      * 司机确认订单
      * orderNumber 运输订单号
@@ -1505,12 +1605,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
     /**
      * 通过运输订单号查询订单信息给司机
-     * @param map
+     * @param orderId
      * @return
      */
-    public Map<String, Object> getMessageToApp(Map<String, Object> map){
+    public Map<String, Object> getMessageToApp(BigDecimal orderId){
         //通过运输订单Id查询订单类型
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
@@ -1533,6 +1632,25 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             case 11:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(orderId);
         }
+        mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;
     }
+
+
+    /**
+     * 通过车牌号查询所有已下发未接收的订单信息
+     * @param map
+     * @return
+     */
+    public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(Map<String, Object> map){
+        String capacityNumber = (String) map.get("capacityNumber");
+        //通过车牌号查询所有未下发的订单ID
+        List<Integer> orderIdList = omstruckOrderMapper.getOrderIdListByCapacityNumber(capacityNumber);
+        List<Map<String, Object>> mesMapList = new ArrayList<>();
+        for (Integer orderId : orderIdList) {
+            Map<String, Object> mesMap = getMessageToApp(new BigDecimal(orderId));
+            mesMapList.add(mesMap);
+        }
+        return  mesMapList;
+    }
 }

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

@@ -1653,9 +1653,7 @@
                            on rce.consignee_id = aso.receive_id
                  left join rms_receive_address rca
                            on rca.address_id = asom.sale_shipping_address_id
-        where rdc.capacity_id = #{capacityId}
-          and oo.order_status = #{orderStatus}
-          and oo.order_type = #{orderType}
+        where oo.ORDER_ID = #{orderId}
     </select>
     <select id="getSaleTruckOrderByCapacityNumMaterial" resultType="java.util.Map">
         select rm.material_name          "materialName",
@@ -2602,7 +2600,7 @@
                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
                            ON OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
         WHERE OO.ORDER_STATUS = 4
-          AND OO.ORDER_TYPE IN (4, 9, 10, 11)
+          AND OO.ORDER_TYPE NOT IN (4, 9, 10, 11)
           AND OO.DRIVER_CAPACITY_ID = #{driverCapacityId}
     </select>
     <!-- 销售订单 -->
@@ -2634,11 +2632,17 @@
 
     <!-- 物资信息 -->
     <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RM.MATERIAL_NAME          AS "materialName",
-               RM.MATERIAL_MODEL         AS "materialMode",
-               RM.MATERIAL_SPECIFICATION AS "materialSpecification",
-               OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
-               OOM.ORDER_MATERIAL_NUMBER AS "materialNumber"
+        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
+                   end
+                   )
+                AS "weightNum"
         FROM OMSTRUCK_ORDER_MATERIAL OOM
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
@@ -2700,7 +2704,104 @@
         select oo.order_id
         from omstruck_order oo
         where oo.driver_capacity_id = #{dcId}
-        and oo.order_status = 3
+          and oo.order_status = 3
+    </select>
+
+    <!-- 销售的运输订单 -->
+    <select id="getSaleMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID                  AS "orderId",
+               OO.ORDER_TYPE                AS "orderType",
+               OO.ORDER_NUMBER              AS "orderNumber",
+               RC.CAPACITY_NUMBER           AS "capacityNumber",
+               RSH.SHIPPER_NAME             AS "shipperName",
+               RCO.CONSIGNEE_COMPANY_NAME   AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT    AS "saleDateOfReceipt"
+        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 RDC.CAPACITY_ID = RC.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 RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RCO
+                           ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转钢材的运输订单 -->
+    <select id="getSteelInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 采购的运输订单 -->
+    <select id="getPurchaseMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber",
+               RSU.SUPPLIER_NAME  AS "loadPoint",
+               RSH.SHIPPER_NAME   AS "unloadPoint"
+        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 RDC.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = APO.PURCHASING_ORGANIZATION_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转的运输订单 -->
+    <select id="getInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID             AS "orderId",
+               OO.ORDER_TYPE           AS "orderType",
+               OO.ORDER_NUMBER         AS "orderNumber",
+               RC.CAPACITY_NUMBER      AS "capacityNumber",
+               RWLOAD.WAREHOUSE_NAME   AS "loadPoint",
+               RWUNLOAD.WAREHOUSE_NAME AS "unloadPoint"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 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
+                 LEFT JOIN RMS_WAREHOUSE RWLOAD
+                           ON RWLOAD.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWUNLOAD
+                           ON RWUNLOAD.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 判断是走采购，销售还是内转 -->
+    <select id="getResultListByCapacity" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_ID   AS "orderId",
+               OO.ORDER_TYPE AS "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+AND OO.ORDER_STATUS = 4
     </select>
 
 <!--  通过运输订单号查询运输订单ID  -->
@@ -2714,22 +2815,11 @@
     <select id="getCGOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT OO.ORDER_ID     "orderId",
                OO.ORDER_NUMBER "orderNumber",
-               (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
-                END)    "weightNum",
-               RM.MATERIAL_NAME "materialName",
                RC.CAPACITY_NUMBER       "capacityNumber",
                RS.SUPPLIER_NAME         "loadName",
                RW.WAREHOUSE_NAME        "unloadName",
                OO.ORDER_TYPE            "orderType"
         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 RMS_DRIVER_CAPACITY RDC
                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RC
@@ -2747,13 +2837,6 @@
     <select id="getNZOrderMessageToApp" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         SELECT OO.ORDER_ID  "orderId",
                OO.ORDER_NUMBER  "orderNumber",
-               (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
-                   END)    "weightNum",
-               RM.MATERIAL_NAME "materialName",
                RC.CAPACITY_NUMBER       "capacityNumber",
                RS.SUPPLIER_NAME         "loadName",
                RW.WAREHOUSE_NAME        "unloadName",
@@ -2767,10 +2850,6 @@
             ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         LEFT JOIN RMS_SUPPLIER  RS
             ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_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_WAREHOUSE RW
             ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
         LEFT JOIN RMS_DRIVER_CAPACITY RDC
@@ -2786,13 +2865,6 @@
                OO.ORDER_TYPE    "orderType",
                OO.ORDER_NUMBER  "orderNumber",
                RC.CAPACITY_NUMBER "capacityNumber",
-               RM.MATERIAL_NAME "materialName",
-               (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
-                   END)    "weightNum",
                RS.SHIPPER_NAME  "loadName",
                RW.WAREHOUSE_NAME    "unloadName"
         FROM OMSTRUCK_ORDER OO
@@ -2800,10 +2872,6 @@
             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 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_SHIPPER RS
             ON RS.SHIPPER_ID = ASO.SHIPPER_ID
         LEFT JOIN RMS_WAREHOUSE RW
@@ -2820,24 +2888,16 @@
                OO.ORDER_TYPE    "orderType",
                OO.ORDER_NUMBER  "orderNumber",
                RC.CAPACITY_NUMBER "capacityNumber",
-               RM.MATERIAL_NAME "materialName",
-               (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
-                   END)    "weightNum",
-               RS.SHIPPER_NAME  "loadName",
-               RC2.CONSIGNEE_COMPANY_NAME    "unloadName"
+               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
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_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_SHIPPER RS
                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                  LEFT JOIN RMS_CONSIGNEE RC2
@@ -2855,4 +2915,16 @@
         FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+
+<!--  通过车牌匹配所有已下发的 的订单Id -->
+    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="int">
+        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
+    </select>
 </mapper>