零星停止

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.java

@@ -142,4 +142,6 @@ public interface OmstruckOrderSeparateMapper {
     //查询计时进程
     List<Map<String, Object>> getTimeOrderResult(Map<String, Object> map);
 
+    Integer getSporadicStatus(Object orderId);
+
 }

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

@@ -1990,6 +1990,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if(orderType == 12|| orderType == 13 || orderType == 14 || orderType == 19){
+                Integer sporadicStatus = omstruckOrderSeparateMapper.getSporadicStatus(orderMesMap.get("orderId"));
+                if(sporadicStatus == 0){ // 数据为0则失效
+                    continue;
+                }
+            }
             //如果订单类型为11 当订单大于截止日期时，不显示订单
             if(orderType == 11){
                 int result = omstruckOrderSeparateMapper.getInward(orderMesMap.get("orderId"));

src/main/resources/application-prod.yml

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

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

@@ -425,6 +425,9 @@
             <if test="status != null">
              and  OO.ORDER_STATUS = #{status}
            </if>
+            <if test="status == 4">
+                and  ASO.TRANS_STATUS = 1
+            </if>
             <if test="type == 1">
                 and OO.ORDER_TYPE in (12, 13 ,14,19)
                 and OO.CAPACITY_ID IS NOT NULL
@@ -809,5 +812,14 @@
         where OO.ORDER_ID = #{orderId}
         order by TTTR.RESULT_TIME
     </select>
+    <select id="getSporadicStatus" resultType="java.lang.Integer">
+        SELECT
+            ASO.TRANS_STATUS
+        FROM
+            OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 
 </mapper>