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

src/main/java/com/steerinfo/dil/feign/ESFeign.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.161:8089/api/v1/es")
+@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.166:8089/api/v1/es")
 public interface ESFeign {
     @PostMapping("getConResult")
     PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -148,7 +148,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
-        //路段顺序号 + 1
+        //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
             case 1:

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

@@ -149,7 +149,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         map.put("orderNumber", substring);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
-        //路段顺序号 + 1
+        //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
             case 1:
@@ -167,7 +167,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 9:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
-//                i += utilsService.updateOrderStatus(map); // 修改运输订单状态 2：已结束
 //                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
                 //采购出厂 通过feign调用新增详单
 //                try {

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

@@ -130,6 +130,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         int i = 0;
         map.putAll(tmstruckUnloadResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        //路段顺序号 + 1
+        i += utilsService.updateOrderLineSequence(map);
         switch (orderType.intValue()){
             case 1:
                 break;
@@ -165,8 +167,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
                 i += utilsService.closeOrderNormally(map);
 
         }
-        //路段顺序号 + 1
-        i += utilsService.updateOrderLineSequence(map);
         //卸货成功后推送消息给websocket
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
         return i;

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

@@ -80,8 +80,8 @@ public class UtilsServiceImpl implements IUtilsService {
     }
 
     /**
-     * 用于更新路段顺序号 + 1
-     * @param map 运输订单号 或者是运输订单ID
+     * 用于更新路段顺序号 取实绩中的路段顺序号
+     * @param map 运输订单号 或者是运输订单ID    实绩中的路段顺序号
      * @return
      */
     public int updateOrderLineSequence(Map<String, Object> map){
@@ -90,10 +90,10 @@ public class UtilsServiceImpl implements IUtilsService {
             //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
-        Integer lineSequence = getLineSequenceByOrderId(orderId);
+        BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
-        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + 1);
+        mesMap.put("orderLineSequence", segmentSqe);
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 

src/main/resources/bootstrap.yml

@@ -18,19 +18,19 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:localhost:8078}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:localhost:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8066}
+    url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:
-    url: ${QMSFEIGN_URL:localhost:8047}
+    url: ${QMSFEIGN_URL:172.16.33.166:8047}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
 

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

@@ -660,7 +660,8 @@
                OO.ORDER_ID         "orderId",
                OO.ORDER_TYPE       "orderTypee", --避免与筛选条件重名
                TER.RESULT_TOTAL_ID "resultTotalId",
-               RC.CAPACITY_NUMBER   "capacityNumber"
+               RC.CAPACITY_NUMBER   "capacityNumber",
+               TER.SEGMEN_SQE       "segmentSqe" --进厂的路段顺序号
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID

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

@@ -570,20 +570,26 @@
 
     <!--  通过运输订单号获取实绩ID -->
     <select id="selectResultId" parameterType="string" resultType="java.util.Map">
-        select TLFR.RESULT_ID "resultId",
-               OO.ORDER_ID "orderId",
-               OO.ORDER_TYPE "orderTypee",
-               TTR.RESULT_TOTAL_ID "resultTotalId",
-               OO.CAPACITY_ID "capacityId",
-               RC.CAPACITY_NUMBER   "capacityNumber"
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on OO.ORDER_ID = TTR.ORDER_ID
-                 left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                           on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 left join RMS_CAPACITY RC
-                           on RC.CAPACITY_ID = OO.CAPACITY_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
+        select *
+        from (
+                 select TLFR.RESULT_ID      "resultId",
+                        OO.ORDER_ID         "orderId",
+                        OO.ORDER_TYPE       "orderTypee",
+                        TTR.RESULT_TOTAL_ID "resultTotalId",
+                        OO.CAPACITY_ID      "capacityId",
+                        RC.CAPACITY_NUMBER  "capacityNumber",
+                        TLFR.SEGMENT_SQE    "segmentsqe"
+                 from OMSTRUCK_ORDER OO
+                          left join TMSTRUCK_TOTAL_RESULT TTR
+                                    on OO.ORDER_ID = TTR.ORDER_ID
+                          left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                                    on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                          left join RMS_CAPACITY RC
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 where OO.ORDER_NUMBER = #{orderNumber} and TLFR.RESULT_OUT_GATE_TIME is null
+                 order by "segmentsqe"
+             )
+        where rownum = 1
     </select>
 
     <!--销售物流查询所有的出厂实绩-->

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

@@ -608,7 +608,8 @@
                OO.ORDER_TYPE       "orderTypee",
                TUR.RESULT_ID       "resultId",
                TTR.RESULT_TOTAL_ID "resultTotalId",
-               RC.CAPACITY_NUMBER "capacityNumber"
+               RC.CAPACITY_NUMBER "capacityNumber",
+               TUR.SEGMENT_SQE      "segmentSqe"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID

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

@@ -667,18 +667,19 @@
 
     <!--  通过运输订单号 查询实绩Id、总实绩ID -->
     <select id="selectTotalIdByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
-        select OO.ORDER_ID "orderId",
-        OO.ORDER_TYPE "orderTypee",
-        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        TTR.RESULT_TOTAL_ID "resultTotalId",
-        RC.CAPACITY_NUMBER  "capacityNumber"
+        select
+                OO.ORDER_ID "orderId",
+                OO.ORDER_TYPE "orderTypee",
+                TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+                TTR.RESULT_TOTAL_ID "resultTotalId",
+                RC.CAPACITY_NUMBER "capacityNumber"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-            on OO.ORDER_ID = TTR.ORDER_ID
+                on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC
-            on RC.CAPACITY_ID = OO.CAPACITY_ID
+                on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
         <if test="materialId != null">
             and TWR.MATERIAL_ID = #{materialId}