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

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

@@ -981,6 +981,9 @@ OmstruckOrderController extends BaseRESTfulController {
     //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
     @PostMapping("/selectNewOrderId")
     public RESTfulResult selectNewOrderId(@RequestBody(required = false) Map<String, Object> map) {
+        if(map.get("remark") != null){
+            map.put("remark", "%" + map.get("remark") +"%");
+        }
         return success(omstruckOrderService.selectNewOrderId(map));
     }
 
@@ -1316,10 +1319,17 @@ OmstruckOrderController extends BaseRESTfulController {
         return success(result);
     }
 
-    @ApiOperation(value = "通过运输订单号查询订单信息给司机")
+    @ApiOperation(value = "通过运输订单Id查询订单信息给司机")
     @PostMapping("/getMessageToApp")
     public Map<String, Object> getMessageToApp(@RequestBody(required = false) Map<String,Object> mapvalue) {
-        BigDecimal orderId = DataChange.dataToBigDecimal(mapvalue.get("orderId"));
+        BigDecimal orderId = null;
+        if(mapvalue.get("orderId") == null){
+            //通过运输订单号查询运输订单Id
+            Integer id = omstruckOrderMapper.getOrderIdByOrderNumber((String) mapvalue.get("orderNumber"));
+            orderId = new BigDecimal(id);
+        }else {
+            orderId = DataChange.dataToBigDecimal(mapvalue.get("orderId"));
+        }
         return omstruckOrderService.getMessageToApp(orderId);
     }
 
@@ -1328,4 +1338,19 @@ OmstruckOrderController extends BaseRESTfulController {
     public List<Map<String, Object>> getAllOrderMessagesByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue) {
         return omstruckOrderService.getAllOrderMessagesByCapacityNum(mapvalue);
     }
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getReceiveOrderIdListByCapacityNum")
+    public List<Integer> getReceiveOrderIdListByCapacityNum(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        String capacityNumber = (String) mapvalue.get("capacityNumber");
+        return omstruckOrderMapper.getReceiveOrderIdListByCapacityNum(capacityNumber);
+    }
+
+
+    @ApiOperation(value = "通过车牌号查询该车牌下所有已接收的订单ID")
+    @PostMapping("/getAllRefuseOrderNumberByCapacity")
+    public List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(@RequestBody(required = false) Map<String,Object> mapvalue) {
+        String capacityNumber = (String) mapvalue.get("capacityNumber");
+        return omstruckOrderMapper.getAllRefuseOrderNumberByCapacity(capacityNumber);
+    }
 }

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

@@ -57,16 +57,6 @@ public class UtilsController extends BaseRESTfulController {
         return success(i);
     }
 
-    //这里是websocket的测试方法
-    @RequestMapping("/websocket/sendToUser")
-    @ResponseBody
-    public String sendToUser(@RequestBody List<Message> messages) {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("messages", messages);
-        imFeign.sendToUser(map);
-        return "成功！";
-    }
-
     //================================================================================================
 //    /**
 //     * 仓储网格数据插入逻辑（！！！非必要情况，千万别打开）
@@ -77,4 +67,5 @@ public class UtilsController extends BaseRESTfulController {
 //        int result = omstruckOrderMaterialService.insertGrid();
 //        return success(result);
 //    }
+
 }

src/main/java/com/steerinfo/dil/feign/IMFeign.java

@@ -6,6 +6,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "DIL-IM-DEV", url = "${openfeign.Im.url}")
 public interface IMFeign {

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

@@ -55,7 +55,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
     //查询所有接单或拒绝接单的订单 PC -- 采购
-    List<Map<String, Object>> getTruckOrderByCapacityNum(Map<String, Object> map);
+    List<Map<String, Object>>   getTruckOrderByCapacityNum(Map<String, Object> map);
 
     //查询所有接单或拒绝接单的订单 PC -- 销售
     List<Map<String, Object>> getSaleTruckOrderByCapacityNum(Map<String, Object> map);
@@ -226,6 +226,15 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过车牌号查询该车牌下所有已下发 未接收 的 订单Id （4）
     List<Integer> getOrderIdListByCapacityNumber(String capacityNumber);
 
+    //通过车牌号查询该车牌下所有已接收的订单ID （5）
+    List<Integer> getReceiveOrderIdListByCapacityNum(String capacityNumber);
+
+    //通过车牌号查询运输订单号和运输订单ID
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(String capacityNumber);
+
+    //通过运输订单Id或运输订单号查询订单类型
+    Integer getOrderTypeByOrderId(BigDecimal orderId);
+
     // 销售中的运输订单
     Map<String, Object> getSaleMap(BigDecimal orderId);
     // 内转钢材的运输订单

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,6 +10,7 @@ public class Message implements Serializable {
     private Object messageContent;
     private String sendPerson;
     private String receivePerson;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     public Message(Integer messageType, Object messageContent, String sendPerson, String receivePerson, Date createTime) {

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

@@ -77,7 +77,7 @@ public interface IOmstruckOrderService {
     //司机接单调用接口推送数据 接收车牌号
     List<Map<String, Object>> sendMesToDriver(Map<String, Object> map);
 
-    //通过运单号查询所有信息
+    //通过运单Id查询所有信息
     List<Map<String, Object>> getOrderMesByOrderNum(Map<String, Object> map);
 
     //查询司机所有已拒绝过的订单

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -139,9 +140,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);
-            omstruckOrder.setDriverCapacityId(DataChange.dataToBigDecimal(capacityMap.get("driverCapacityId"))); //添加运力排班ID
+            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力排班ID
             omstruckOrder.setOrderEntryTime(orderEntryTime);
-            omstruckOrder.setLineId(new BigDecimal(1));  // 设置线路 遗留问题
             count += omstruckOrderMapper.insertSelective(omstruckOrder);
             BigDecimal orderId = omstruckOrder.getOrderId();
             //添加运输订单子表
@@ -150,7 +150,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             addOrderMaterial(capacityMap,orderId);
             //添加总实绩
             capacityMap.put("orderId", orderId);
-            tmsTruckFeign.addTotalResult(map);
+            tmsTruckFeign.addTotalResult(capacityMap);
             //更改运力状态
         }
         return count;
@@ -167,8 +167,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public int addCGPurOrder(Map<String, Object> map) {
         //生成运输订单号和主键
         OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
-        //设置线路  遗留问题
-        omstruckOrder.setLineId(new BigDecimal(1));
         Object orderEntryTime = map.get("orderEntryTime");
         if (orderEntryTime != null) {
             omstruckOrder.setOrderEntryTime(new Date((long) orderEntryTime)); //新增预计进厂时间
@@ -205,6 +203,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int id = maxId.intValue();
         String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", id);
         omstruckOrder.setOrderNumber(orderNumber);
+        //设置线路
+        omstruckOrder.setLineId(DataChange.dataToBigDecimal(map.get("lineId")));
         //运单状态 刚分配默认为未下发
         omstruckOrder.setOrderStatus(new BigDecimal(3));
         switch (orderType.intValue()) {
@@ -212,8 +212,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("saleOrderMaterialId")));
                 break;
             case 2:
-                omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("dayPlanId")));
-                break;
             case 3:
                 omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("dayPlanId")));
                 break;
@@ -317,9 +315,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
                 omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
                 omstruckOrderMaterial.setOrderId(orderId);
-                if (map.get("orderMaterialWeight") != null) // 采购辅料没有物资重量
+                if (map.get("orderMaterialWeight") != null)
                     omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
-                if(map.get("orderMaterialNumber") != null) // 辅料可能有物资件数
+                if(map.get("orderMaterialNumber") != null)
                     omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("orderMaterialNumber")));
                 omstruckOrderMaterial.setInsertUsername("admin");
                 omstruckOrderMaterial.setInsertTime(new Date());
@@ -521,14 +519,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     public int driverReceiveOrRefuse(Map<String, Object> map) {
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         if((Integer) map.get("orderReceiveStatus") == 1){
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(1));
+            List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
+            if(orderIdList.size() > 0){
+                return 0;
+            }
             omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
             //添加实绩
-            addSomeResult(DataChange.dataToBigDecimal(map.get("orderId")).intValue());
+            addSomeResult(orderId.intValue());
         }else { //其他状态都视为 拒绝接单
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(0));
             omstruckOrder.setOrderStatus(new BigDecimal(6));
             //添加拒绝原因
             omstruckOrder.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
@@ -538,7 +540,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 //            map.put("capacityStatus", 0);
 //            omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
         }
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         omstruckOrder.setOrderId(orderId);
         //生成接收/拒绝时间
         Date receiveTime = new Date();
@@ -564,12 +565,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //通过运输订单ID查询运输订单子表有几种物资 ：物资ID
         List<Integer> materialIdList = omstruckOrderMapper.getMaterialIdListByOrderId(orderId);
         //生成进厂实绩
+        Integer orderType = DataChange.dataToBigDecimal(map.get("orderType")).intValue();
+        if(orderType != 1)
+            //先默认给个门岗
+            map.put("gatepostId", 1); //如果不是销售订单
         tmsTruckFeign.addEnFactoryResult(map);
         //生成出厂实绩
         tmsTruckFeign.addLeaveFactory(map);
-        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
-        switch (orderType.intValue()) {
+        switch (orderType) {
             case 1:
+            case 4:
                 //如果有多种物资 就添加多条装车实绩和计量实绩
                 for (Integer materialId : materialIdList) {
                     map.put("materialId", materialId);
@@ -583,8 +588,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 tmsTruckFeign.addWeightResult(map);
                 tmsTruckFeign.addLoadResult(map);
                 break;
-            case 4:
-                break;
             case 5:
             case 6:
             case 7:

src/main/resources/bootstrap.yml

@@ -45,9 +45,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.161:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.161:8079}
+    url: ${AMSFEIGN_URL:localhost:8079}
   Im:
     url: ${AMSFEIGN_URL:172.16.33.161:8888}
 

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

@@ -727,7 +727,7 @@
                     and OO.ORDER_STATUS = #{orderStatus}
                 </when>
                 <otherwise>
-                    and OO.ORDER_STATUS in (1, 2, 4, 5, 6)
+                    and OO.ORDER_STATUS in (0, 1, 2, 4, 5, 6)
                 </otherwise>
             </choose>
             <if test="planId != null ">
@@ -1253,20 +1253,20 @@
                RM.MATERIAL_NAME          "materialName",
                OO.ORDER_ENTRY_TIME       "orderEntryTime",
                OO.ORDER_TYPE             "orderType",
-               OO.UNLOAD_POINT_ID        "unloadPointId",
+               RW.WAREHOUSE_NAME        "warehouseName",
                OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
         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 RDC.CAPACITY_ID = RC.CAPACITY_ID
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
                  left join AMS_PURCHASE_ORDER APO
                            on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_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
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
@@ -1567,16 +1567,12 @@
                RM.MATERIAL_NAME          "materialName",
                RC.CAPACITY_NUMBER        "capacityNumber"
         from OMSTRUCK_ORDER OO
-                 left join RMS_DRIVER_CAPACITY RDC
-                           on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
                  left join RMS_CAPACITY RC
-                           on RC.CAPACITY_ID = RDC.CAPACITY_ID
+                           on RC.CAPACITY_ID = OO.CAPACITY_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
         where OO.ORDER_ID = #{orderId}
     </select>
 
@@ -1584,14 +1580,20 @@
     <!--  //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号 -->
     <select id="selectNewOrderId" parameterType="java.util.Map" resultType="java.util.Map">
         select *
-        from (select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
-                     apo.PURCHASE_ORDER_ID "purchaseOrderId"
+        from (
+            select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
+                     apo.PURCHASE_ORDER_ID "purchaseOrderId",
+                   db.RESULT_FOREIGN_SHIP_NAME  "remark"
 
               from AMS_PURCHASE_ORDER APO
                        join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
               where db.MATERIAL_ID = #{materialId}
                 and apo.SUPPLIER_UNIT_ID = #{supplierId}
-              order by db.INSERT_TIME desc)
+                <if test="remark != null">
+                    and db.RESULT_FOREIGN_SHIP_NAME like #{remark}
+                </if>
+              order by db.INSERT_TIME desc
+            )
         where rownum = 1
     </select>
 
@@ -2819,10 +2821,8 @@
                RW.WAREHOUSE_NAME  "unloadName",
                OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                           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
@@ -2841,20 +2841,18 @@
                RW.WAREHOUSE_NAME  "unloadName",
                OO.ORDER_TYPE      "orderType"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
-                           ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
-                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
-                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
-                 LEFT JOIN AMS_PURCHASE_ORDER APO
-                           ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-                 LEFT JOIN RMS_SUPPLIER RS
-                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+            ON OO.ORDER_PLAN_ID = ARP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+            ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+            ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN RMS_SUPPLIER  RS
+            ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
 
     </select>
@@ -2867,18 +2865,16 @@
                RS.SHIPPER_NAME    "loadName",
                RW.WAREHOUSE_NAME  "unloadName"
         FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                           on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-                 LEFT JOIN AMS_SALE_ORDER ASO
-                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                 LEFT JOIN RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-                 LEFT JOIN RMS_WAREHOUSE RW
-                           ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-                 LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+            on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER  ASO
+            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS
+            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+            ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = OO.CAPACITY_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
     <!--  查询销售运输订单给APP 1 -->
@@ -2890,7 +2886,7 @@
                RS.SHIPPER_NAME               "shipperName",
                ASOM.SALE_DATE_OF_RECEIPT     "saleDateOfReceipt",
                RC2.CONSIGNEE_COMPANY_NAME    "consigneeCompanyName",
-               RC2.CONSIGNEE_RECEIVE_ADDRESS "consigneeReceiveAddress"
+               CONCAT(CONCAT(CONCAT(RDA.ADDRESS_PROVINCE,RDA.ADDRESS_DISTRICT),RDA.ADDRESS_TOWN),RDA.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName"
 
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
@@ -2901,10 +2897,10 @@
                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                  LEFT JOIN RMS_CONSIGNEE RC2
                            ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
-                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
-                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RDA
+                           ON RDA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
 
@@ -2919,11 +2915,35 @@
     <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 = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber} AND OO.ORDER_STATUS = 4
+    </select>
+
+<!--  根据车牌号匹配所有已接收的运输订单Id  -->
+    <select id="getReceiveOrderIdListByCapacityNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT
+            OO.ORDER_ID
+        FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
-                           ON RC.CAPACITY_ID = RDC.CAPACITY_ID
-        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
-          AND OO.ORDER_STATUS = 4
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber} AND OO.ORDER_STATUS in (0, 1 ,5)
+    </select>
+
+<!--    通过车牌号查询运输订单号和运输订单ID  -->
+    <select id="getAllRefuseOrderNumberByCapacity" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_ID "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+        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 = 6
+    </select>
+
+<!--   通过订单号或订单ID查询订单类型 -->
+    <select id="getOrderTypeByOrderId" parameterType="map" resultType="java.lang.Integer">
+        select ORDER_TYPE
+        from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId}
     </select>
 </mapper>