|
@@ -3409,7 +3409,6 @@
|
|
|
( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
|
|
|
( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
|
|
|
( SELECT CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
|
|
|
-
|
|
|
RM.MATERIAL_NAME "materialName"
|
|
|
FROM
|
|
|
OMSTRUCK_ORDER OO
|
|
@@ -3420,7 +3419,7 @@
|
|
|
LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
|
|
|
WHERE
|
|
|
- OO.ORDER_ID = #{orderId} and TTTR.RESULT_TIME_TYPE = 3
|
|
|
+ OO.ORDER_ID = #{orderId}
|
|
|
<if test="status == null">
|
|
|
AND OO.ORDER_STATUS in (4, 5, 6)
|
|
|
</if>
|