修改

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

@@ -149,4 +149,8 @@ public interface OmstruckOrderSeparateMapper {
 
     String getPrintFlag();
 
+    int getPurOrderDelete(Object orderId);
+
+    int getPurOrderDelete1(Object orderId);
+
 }

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

@@ -2222,10 +2222,18 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
+            if (orderType == 5 || orderType == 6 || orderType == 7 || orderType == 17 || orderType == 18) {
+                int purOrderDelete = omstruckOrderSeparateMapper.getPurOrderDelete1(orderMesMap.get("orderId"));
+                if(purOrderDelete == 1) {
+                    omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
+                    continue;
+                }
+            }
             if(orderType == 10|| orderType == 20 || orderType == 15 || orderType == 16){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 int GoBeyondCount = omstruckOrderMapper.getGoBeyondCount(orderMesMap.get("orderId"));
-                if(planEnable == 0 || GoBeyondCount == 0){ // 数据为0则失效
+                int purOrderDelete = omstruckOrderSeparateMapper.getPurOrderDelete(orderMesMap.get("orderId"));
+                if(planEnable == 0 || GoBeyondCount == 0 || purOrderDelete == 1){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }
@@ -2233,7 +2241,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 int GoBeyondCount = omstruckOrderMapper.getGoBeyondCount(orderMesMap.get("orderId"));
-                if(planEnable == 0 || GoBeyondCount == 0){ // 数据为0则失效
+                int purOrderDelete = omstruckOrderSeparateMapper.getPurOrderDelete(orderMesMap.get("orderId"));
+                if(planEnable == 0 || GoBeyondCount == 0 || purOrderDelete == 1){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }

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

@@ -1011,4 +1011,20 @@
         LEFT JOIN RMS_GATEPOST RG ON RG.GATEPOST_ID = TER.GATEPOST_ID
     WHERE	TER.RESULT_ENTRY_GATE_TIME IS NOT NULL AND RG.SHIPPER_ID = 1 AND TTR.ORDER_ID = #{orderId}
     </select>
+    <select id="getPurOrderDelete" resultType="java.lang.Integer">
+    SELECT nvl(APO.DELETED,0) FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+    ON ARP.PLAN_ID = OO.ORDER_PLAN_ID
+    LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+    ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+    LEFT JOIN AMS_PURCHASE_ORDER APO
+    ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+    WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getPurOrderDelete1" resultType="java.lang.Integer">
+        SELECT nvl(APO.DELETED,0) FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>