Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

@@ -305,23 +305,23 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
                 switch (type){
                     case 0:
                         mesMap.put("linkName", "达兴门岗时间");
-                        mesMap.put("segmentSqe", sqe ++);
+                        mesMap.put("segmenSqe", sqe ++);
                         break;
                     case 1:
                         mesMap.put("linkName", "计时开始");
-                        mesMap.put("segmentSqe", sqe ++);
+                        mesMap.put("segmenSqe", sqe ++);
                         break;
                     case 3:
                         mesMap.put("linkName", "计时结束");
-                        mesMap.put("segmentSqe", sqe ++);
+                        mesMap.put("segmenSqe", sqe ++);
                         break;
                     case 5:
                         mesMap.put("linkName", "开始暂停计时");
-                        mesMap.put("segmentSqe", sqe ++);
+                        mesMap.put("segmenSqe", sqe ++);
                         break;
                     case 7:
                         mesMap.put("linkName", "结束暂停计时");
-                        mesMap.put("segmentSqe", sqe ++);
+                        mesMap.put("segmenSqe", sqe ++);
                 }
                 returnMap.add(mesMap);
             }

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

@@ -1946,7 +1946,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 mesMap.put("inwardType", inwardType);
                 break;
             case 21:
-                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardTimeOrderMessageToApp(map);
                 inwardType += "计时";
                 mesMap.put("inwardType", inwardType);
                 break;

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

@@ -3334,7 +3334,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",
@@ -3346,8 +3347,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
@@ -3359,8 +3358,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

@@ -697,7 +697,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
@@ -709,6 +709,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">
@@ -738,7 +743,7 @@
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_TIME_TASK_RESULT TTTR on TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
-        where OO.ORDER_ID = #{resultTotalId}
+            where TTR.RESULT_TOTAL_ID = #{resultTotalId}
         order by TTTR.RESULT_TIME
     </select>
     <select id="getSporadicStatus" resultType="java.lang.Integer">
@@ -755,7 +760,7 @@
         select
             TER.RESULT_ENTRY_GATE_TIME   "pointDate",
             RG.GATEPOST_NAME             "pointName",
-            TER.SEGMEN_SQE                "segmentSqe",
+            TER.SEGMEN_SQE                "segmenSqe",
             '进厂'                          "linkName"
         from TMSTRUCK_ENFACTORY_RESULT TER
                  left join RMS_GATEPOST RG
@@ -773,7 +778,7 @@
         UNION
         select TLFR.RESULT_OUT_GATE_TIME    "pointDate",
                RG.GATEPOST_NAME     "pointName",
-               TLFR.SEGMENT_SQE      "segmentSqe",
+               TLFR.SEGMENT_SQE      "segmenSqe",
                '出厂'                          "linkName"
         from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                  left join RMS_GATEPOST RG
@@ -782,7 +787,7 @@
         UNION
         select TLR.RESULT_LOAD_END_TIME "pointDate",
                RW.WAREHOUSE_NAME "pointName",
-               TLR.SEGMENT_SQE     "segmentSqe",
+               TLR.SEGMENT_SQE     "segmenSqe",
                '装货'                          "linkName"
         from TMSTRUCK_LOAD_RESULT TLR
                  left join TMSTRUCK_TOTAL_RESULT TTR
@@ -791,10 +796,11 @@
                            on RW.WAREHOUSE_ID = TLR.LOADING_ID
         where TLR.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
+
     <select id="getFourDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
-               TWR.TARE_SEGMENT_SQE         "segmentSqe",
+               TWR.TARE_SEGMENT_SQE         "segmenSqe",
                '计皮'                        "linkName",
                TWR.RESULT_TARE_WEIGHT       "weight",
                RM.MATERIAL_NAME             "materialName"
@@ -807,7 +813,7 @@
         UNION
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
-               TWR.GROSS_SEGMENT_SQE         "segmentSqe",
+               TWR.GROSS_SEGMENT_SQE         "segmenSqe",
                '计毛'                        "linkName",
                TWR.RESULT_GROSS_WEIGHT     "weight",
                RM.MATERIAL_NAME            "materialName"