|
|
@@ -1738,12 +1738,17 @@
|
|
|
ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
|
|
|
OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
|
|
|
RS.SHIPPER_NAME "shipperName",
|
|
|
- OO.ORDER_ID "orderId"
|
|
|
+ OO.ORDER_ID "orderId",
|
|
|
+ RC3.CARRIER_NAME "carrierName"
|
|
|
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 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
|
|
|
@@ -1759,7 +1764,7 @@
|
|
|
AND OO.ORDER_STATUS = #{orderStatus}
|
|
|
</if>
|
|
|
<if test="carrierId!=null">
|
|
|
- and RC.CARRIER_ID = #{carrierId}
|
|
|
+ and RC3.CARRIER_ID = #{carrierId}
|
|
|
</if>
|
|
|
<if test="orderTypee!=null">
|
|
|
and OO.ORDER_TYPE in (1, 2)
|
|
|
@@ -1776,6 +1781,11 @@
|
|
|
"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=")">
|
HUJIANGUO