修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-oms-api</artifactId>
-    <version>1.7</version>
+    <version>1.8</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -162,4 +162,5 @@ public interface OmstruckOrderSeparateMapper {
     String getAddressPlace(BigDecimal orderId);
 
 
+    Integer getSaleType(Object orderId);
 }

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

@@ -2354,8 +2354,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }
             if (orderType == 1) {
                 Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDatePass(orderMesMap.get("orderId"));
+                Integer saleType = omstruckOrderSeparateMapper.getSaleType(orderMesMap.get("orderId"));
                 Integer saleOrderDelete = omstruckOrderSeparateMapper.getSaleOrderDelete(orderMesMap.get("orderId"));
-                if(judgeDate == null || saleOrderDelete != 0){ // 数据为空则是已过截止日期 关闭订单
+                if(saleType == 1 && (judgeDate == null || saleOrderDelete != 0)){ // 数据为空则是已过截止日期 关闭订单
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }

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

@@ -1078,4 +1078,12 @@
         WHERE OO.ORDER_ID = #{orderId}
           AND OO.ORDER_TYPE = 1
     </select>
+    <select id="getSaleType" resultType="java.lang.Integer">
+        select NVL(aso.SALE_TYPE,0)
+        from OMSTRUCK_ORDER OO
+                 join AMS_SALE_ORDER_MATERIAL ASOM
+                      on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 left join AMS_SALE_ORDER ASO on aso.SALE_ORDER_ID = asom.SALE_ORDER_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>