|
|
@@ -1955,8 +1955,7 @@
|
|
|
ASM.MATERIAL_WEIGHT "theoryWeight",
|
|
|
rsa.area_name "areaName",
|
|
|
aso.sale_order_receive_customer "receiveMoneyCus",
|
|
|
- ASM.EAS_PRIMARY_ID "easPrimaryId" ,
|
|
|
- ASO.SALE_ORDER_ID
|
|
|
+ ASM.EAS_PRIMARY_ID "easPrimaryId"
|
|
|
FROM
|
|
|
BMSTRUCK_DETAILS_ORDER bdo
|
|
|
JOIN TMSTRUCK_WEIGHT_RESULT twr ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
|
|
|
@@ -1982,7 +1981,6 @@
|
|
|
WHERE
|
|
|
oo.ORDER_TYPE = 1
|
|
|
AND bdo.WETHER_TO_STATEMENT = 0
|
|
|
- order by oo.order_id desc
|
|
|
<if test="carrierId != null">
|
|
|
and RC2.CARRIER_ID = #{carrierId}
|
|
|
</if>
|
|
|
@@ -1993,6 +1991,7 @@
|
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= bdo.INSERT_TIME
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
|
|
|
</if>
|
|
|
+ order by oo.order_id desc
|
|
|
)
|
|
|
</select>
|
|
|
|
luobang