”修改内转计时

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/resources/application-dev.yml

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

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

@@ -743,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">
@@ -760,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
@@ -778,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
@@ -787,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
@@ -796,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"
@@ -812,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"