|
@@ -926,17 +926,17 @@
|
|
|
|
|
|
FROM TMSTRUCK_UNLOAD_RESULT TUR
|
|
FROM TMSTRUCK_UNLOAD_RESULT TUR
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
|
|
LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
|
|
- ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
|
|
|
|
|
|
+ ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
|
|
LEFT JOIN OMSTRUCK_ORDER OO
|
|
LEFT JOIN OMSTRUCK_ORDER OO
|
|
- ON OO.ORDER_ID = TTR.ORDER_ID
|
|
|
|
|
|
+ ON OO.ORDER_ID = TTR.ORDER_ID
|
|
LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
|
|
LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
|
|
- ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
|
|
|
|
|
|
+ ON OO.ORDER_PLAN_ID = ASO.SPORADIC_ORDER_ID
|
|
LEFT JOIN RMS_CAPACITY RC
|
|
LEFT JOIN RMS_CAPACITY RC
|
|
- ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
|
|
|
+ ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
LEFT JOIN RMS_WAREHOUSE RW
|
|
LEFT JOIN RMS_WAREHOUSE RW
|
|
- ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
|
|
|
|
- WHERE TUR.RESULT_START_TIME IS NOT NULL
|
|
|
|
- AND OO.ORDER_TYPE = 12
|
|
|
|
|
|
+ ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
|
|
|
|
+ WHERE TUR.RESULT_END_TIME IS NOT NULL
|
|
|
|
+ AND OO.ORDER_TYPE = 12
|
|
)
|
|
)
|
|
<where>
|
|
<where>
|
|
<if test="orderNumber != null">
|
|
<if test="orderNumber != null">
|