冷轧调度优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/taskassigning/service/impl/ProductionScheduleTaServiceImpl.java

@@ -310,13 +310,15 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
                     // 交货期处理
                     if(!minTimePros){
                         Date deliveryDate = v.getProduceOrder().get(0).getDeliveryDate();
-                        LocalDateTime deliveryLTime = deliveryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
-                        LocalDateTime startTime = v.getApsOverallConfig().getStartTime();
-                        LocalDateTime endTime = startTime.plusHours(24);
-                        if(deliveryLTime.compareTo(startTime) > 0 && deliveryLTime.compareTo(endTime) <= 0){
-                            minTimePros =  true;
-                        }else{
-                            minTimePros =  false;
+                        if(deliveryDate == null){
+                            LocalDateTime deliveryLTime = deliveryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                            LocalDateTime startTime = v.getApsOverallConfig().getStartTime();
+                            LocalDateTime endTime = startTime.plusHours(24);
+                            if(deliveryLTime.compareTo(startTime) > 0 && deliveryLTime.compareTo(endTime) <= 0){
+                                minTimePros =  true;
+                            }else{
+                                minTimePros =  false;
+                            }
                         }
                     }