排程开始时间设定

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

@@ -300,9 +300,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         if (apsConfigs != null && apsConfigs.size()>0){
             ApsScheduleConfigDo apsScheduleConfig = apsConfigs.get(0);
             productionScheduleVo.setPlanSeconds(apsScheduleConfig.getScheduleruntime());
-            if(productionScheduleVo.getApsPlanStartDate() == null){
-                productionScheduleVo.setApsPlanStartDate(apsScheduleConfig.getApsplanstartdate());
-            }
             Map<String,Integer> roamTime = new HashMap<>();
             roamTime.put("WORKSHOP_IN",apsScheduleConfig.getWorkshopin());
             roamTime.put("WORKSHOP_CROSS",apsScheduleConfig.getWorkshopcross());
@@ -312,7 +309,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if(apsScheduleConfig.getStartschedulerun() != null){
                 a = apsScheduleConfig.getStartschedulerun();
             }
-            productionScheduleVo.setApsPlanStartDate(DateUtil.date().offset(DateField.HOUR,a));
+            if(apsScheduleConfig.getApsplanstartdate() != null){
+                productionScheduleVo.setApsPlanStartDate(apsScheduleConfig.getApsplanstartdate());
+            }else{
+                productionScheduleVo.setApsPlanStartDate(DateUtil.date().offset(DateField.HOUR,a));
+            }
         }else{
             throw new CustomException("排程参数缺失");
         }