|
@@ -662,7 +662,7 @@
|
|
order by TUR.RESULT_END_TIME desc
|
|
order by TUR.RESULT_END_TIME desc
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
- ) where rownum <= 30
|
|
|
|
|
|
+ ) where rownum <= 100
|
|
</select>
|
|
</select>
|
|
<select id="getOrderPlanEnable" resultType="java.lang.Integer">
|
|
<select id="getOrderPlanEnable" resultType="java.lang.Integer">
|
|
SELECT AIP.PLAN_EABLE_STATUS
|
|
SELECT AIP.PLAN_EABLE_STATUS
|
|
@@ -784,26 +784,31 @@
|
|
</where>
|
|
</where>
|
|
</select>
|
|
</select>
|
|
<select id="getTimeTaskEndOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
<select id="getTimeTaskEndOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
|
|
+ select * from (
|
|
SELECT
|
|
SELECT
|
|
- OO.ORDER_NUMBER "orderNumber",
|
|
|
|
- RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
|
- OO.ORDER_ID "orderId",
|
|
|
|
- ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
|
|
|
|
- ( 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 TTTR3.RESULT_ABOUT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "aboutTime",
|
|
|
|
- ( 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",
|
|
|
|
- TTTR.INSERT_TIME "insertTime",
|
|
|
|
- RM.MATERIAL_NAME "materialName"
|
|
|
|
|
|
+ OO.ORDER_NUMBER "orderNumber",
|
|
|
|
+ RC.CAPACITY_NUMBER "capacityNumber",
|
|
|
|
+ OO.ORDER_ID "orderId",
|
|
|
|
+ ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID =
|
|
|
|
+ TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
|
|
|
|
+ ( 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 TTTR3.RESULT_ABOUT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID =
|
|
|
|
+ TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "aboutTime",
|
|
|
|
+ ( 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",
|
|
|
|
+ TTTR.INSERT_TIME "insertTime",
|
|
|
|
+ RM.MATERIAL_NAME "materialName"
|
|
FROM
|
|
FROM
|
|
- OMSTRUCK_ORDER OO
|
|
|
|
- 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 TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
|
- LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
|
- 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
|
|
|
|
|
|
+ OMSTRUCK_ORDER OO
|
|
|
|
+ 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 TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
|
+ LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
|
+ 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
|
|
WHERE
|
|
- TTTR.RESULT_TIME_TYPE in (1,3) and TTTR.INSERT_USERNAME =#{userId}
|
|
|
|
|
|
+ TTTR.RESULT_TIME_TYPE in (1,3) and TTTR.INSERT_USERNAME =#{userId}
|
|
<if test="orderType!=null and orderType==21">
|
|
<if test="orderType!=null and orderType==21">
|
|
AND OO.ORDER_TYPE IN (21,11)
|
|
AND OO.ORDER_TYPE IN (21,11)
|
|
</if>
|
|
</if>
|
|
@@ -815,6 +820,7 @@
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
order by "insertTime" desc
|
|
order by "insertTime" desc
|
|
</if>
|
|
</if>
|
|
|
|
+ ) where rownum <= 100
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="getInward" resultType="java.lang.Integer">
|
|
<select id="getInward" resultType="java.lang.Integer">
|