|
@@ -310,7 +310,7 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
|
|
// 交货期处理
|
|
// 交货期处理
|
|
if(!minTimePros){
|
|
if(!minTimePros){
|
|
Date deliveryDate = v.getProduceOrder().get(0).getDeliveryDate();
|
|
Date deliveryDate = v.getProduceOrder().get(0).getDeliveryDate();
|
|
- if(deliveryDate == null){
|
|
|
|
|
|
+ if(deliveryDate != null){
|
|
LocalDateTime deliveryLTime = deliveryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
LocalDateTime deliveryLTime = deliveryDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
|
|
LocalDateTime startTime = v.getApsOverallConfig().getStartTime();
|
|
LocalDateTime startTime = v.getApsOverallConfig().getStartTime();
|
|
LocalDateTime endTime = startTime.plusHours(24);
|
|
LocalDateTime endTime = startTime.plusHours(24);
|