修改

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1942,7 +1942,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 21:
-                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardTimeOrderMessageToApp(map);
                 inwardType += "计时";
                 mesMap.put("inwardType", inwardType);
                 mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");

src/main/resources/application-dev.yml

@@ -13,9 +13,9 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8055}
 

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

@@ -3326,7 +3326,8 @@
         where OO.ORDER_ID= #{orderId}  AND   TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3
     </select>
     <select id="getInwardTimeOrderMessageToApp" resultType="java.util.Map">
-        SELECT OO.ORDER_ID            "orderId",
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
         OO.ORDER_NUMBER        "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
         RC.CAPACITY_NUMBER     "capacityNumber",
@@ -3338,8 +3339,6 @@
         AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
         RW1.WAREHOUSE_NAME       "loadName",
         RW.WAREHOUSE_NAME        "unloadName",
-        CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME)  AS "resultTime",
-        TTTR.INSERT_TIME "insertTime",
         (
         SELECT TTTR2.RESULT_TIME
         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
@@ -3351,8 +3350,13 @@
         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
         WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
         AND TTTR2.RESULT_TIME_TYPE = 3
-        ) "endTime"
-
+        ) "endTime",
+        (
+        SELECT TTTR2.RESULT_VALUE
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "totalTime"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID

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

@@ -759,7 +759,7 @@
             ( 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  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
@@ -771,6 +771,11 @@
                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
         WHERE
                 TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3 and TTTR.INSERT_USERNAME =#{userId}
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
     </select>
 
     <select id="getInward" resultType="java.lang.Integer">