Browse Source

计时、装卸货显示最近100条数据。

xiaosonghong 2 months ago
parent
commit
e6fa536b94

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -4176,9 +4176,9 @@
                       LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
                                 ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
              where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
-              <!-- and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd') -->
+               and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
              GROUP BY TLR.CAPACITY_REMARK
-            ) where rownum &lt;= 30
+            )
     </select>
 
     <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >

+ 24 - 18
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -662,7 +662,7 @@
                 order by TUR.RESULT_END_TIME desc
             </if>
         </where>
-        ) where rownum &lt;= 30
+        ) where rownum &lt;= 100
     </select>
   	<select id="getOrderPlanEnable" resultType="java.lang.Integer">
         SELECT  AIP.PLAN_EABLE_STATUS
@@ -784,26 +784,31 @@
         </where>
     </select>
     <select id="getTimeTaskEndOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select * from (
         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
-            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
-                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">
             AND OO.ORDER_TYPE IN (21,11)
         </if>
@@ -815,6 +820,7 @@
         <if test="orderField == null  ">
             order by "insertTime" desc
         </if>
+            ) where rownum &lt;= 100
     </select>
 
     <select id="getInward" resultType="java.lang.Integer">