cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsServiceImpl.java

@@ -395,7 +395,7 @@ public class ApsServiceImpl implements ApsService {
         Map<String, Equipment> allEqs = new HashMap<>();
         // 统一排程开始时间
         List<ApsScheduleConfigDo> apsConfigs = apsScheduleConfigService.list();
-        /*Date apsPlanStartDate = new Date();
+        Date apsPlanStartDate = new Date();
         if (apsConfigs != null && apsConfigs.size() > 0) {
             ApsScheduleConfigDo apsScheduleConfig = apsConfigs.get(0);
             int a = 8;
@@ -408,9 +408,9 @@ public class ApsServiceImpl implements ApsService {
                 apsPlanStartDate = DateUtil.date().offset(DateField.HOUR, a);
             }
         }
-        Date finalApsPlanStartDate = apsPlanStartDate;*/
-        Date finalApsPlanStartDate = Date.from(
-                LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0).atZone(ZoneId.systemDefault()).toInstant());
+        Date finalApsPlanStartDate = apsPlanStartDate;
+        /*Date finalApsPlanStartDate = Date.from(
+                LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0).atZone(ZoneId.systemDefault()).toInstant());*/
         if (cdorders != null && cdorders.size() > 0) {
             try {
                 apsOrderScheduleApsNew(cdorders, currentUser, allEqs, finalApsPlanStartDate, null, apsType, needUnLockProcessIdList, startTime);