Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/resources/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.xml

@@ -1333,6 +1333,8 @@
     on RG.GATEPOST_ID = TER.GATEPOST_ID
  where TER.RESULT_ENTRY_GATE_TIME is not null
    and OO.ORDER_TYPE = 10
+   order by
+   ter.result_entry_gate_time desc
         <where>
             <if test="purchaseOrderId != null">
                 <foreach collection="purchaseOrderId" item="item" open="(" separator="or" close=")">
@@ -1426,6 +1428,6 @@
     on RG.GATEPOST_ID = TLFR.GATEPOST_ID
  where RESULT_OUT_GATE_TIME is not null
    and OO.ORDER_TYPE = 10
+    order by tlfr.result_out_gate_time
     </select>
-
 </mapper>

src/main/resources/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.xml

@@ -1335,6 +1335,7 @@
         ON RW.WAREHOUSE_ID = TLR.LOADING_ID
         WHERE OO.ORDER_TYPE =#{orderTypee}
         AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        order by tlr.result_load_end_time
              )
         <where>
             <if test="purchaseOrderNo != null">

src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml

@@ -762,8 +762,7 @@
     <!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
     <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
-        FROM (
-        SELECT TUR.RESULT_ID         "resultId",
+        FROM (     SELECT TUR.RESULT_ID         "resultId",
         OO.ORDER_NUMBER       "orderNumber",
         RC.CAPACITY_NUMBER    "capacityNumber",
         RM.MATERIAL_NAME      "materialName",
@@ -787,6 +786,7 @@
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
         AND OO.ORDER_TYPE = 10
+        order by tur.result_end_time desc
         )
         <where>
             <if test="orderNumber != null">