更新 'src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java'

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

@@ -1906,9 +1906,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
-                mesMap.get("orderStatus");
-                map.put("orderStatus",mesMap.get("orderStatus"));
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
                 break;
@@ -1943,6 +1940,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 if(judgeDate == null){ // 数据为空则不是当天的订单
                     continue;
                 }
+            }
+          	if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+                Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
+                if(planEnable == 0){ // 数据为0则失效
+                    continue;
+                }
             }
             Map<String, Object> mesMap = getMessageToApp(orderMesMap);
             mesMapList.add(mesMap);