Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS into dev

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

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