临界值判断

services/base/implments/WorkLine.service.impl.go

@@ -546,10 +546,10 @@ func (impl *WorkLineServiceImplement) WorkLineScheduler(user *models.Usertab, wo
 		schedeng schedule.SchedulerSrv
 		err      error
 	)
-
+	endDate = endDate.Add(1*time.Second)
 	schedeng = schedule.SchedulerSrv{PlantNr: user.Pid, StartDate: startDate, EndDate: endDate}
 	schedeng.Tmsrv.StartDate = startDate
-	schedeng.Tmsrv.EndDate = endDate.Add(1)
+	schedeng.Tmsrv.EndDate = endDate
 	// 加载激活的项目主数据
 	err = schedeng.LoadProjectData()
 	if err != nil {
@@ -605,10 +605,10 @@ func (impl *WorkLineServiceImplement) WorkLineSchedulerManPower(user *models.Use
 		schedeng schedule.SchedulerSrv
 		err      error
 	)
-
+	endDate = endDate.Add(1*time.Second)
 	schedeng = schedule.SchedulerSrv{PlantNr: user.Pid, StartDate: startDate, EndDate: endDate}
 	schedeng.Tmsrv.StartDate = startDate
-	schedeng.Tmsrv.EndDate = endDate.Add(1)
+	schedeng.Tmsrv.EndDate = endDate
 	// 加载激活的项目主数据
 	err = schedeng.LoadProjectData()
 	if err != nil {

services/schedule/WorkLoad.Ctrl.go

@@ -19,6 +19,10 @@ func (wloadsrv *WorkLoadSrv) Init() {
 		wloadsrv.WorkLoadPercent = 0.0
 		return
 	}
+	//判断
+	if wloadsrv.AvailCapacity < wloadsrv.RestCapacity{
+		wloadsrv.RestCapacity = wloadsrv.AvailCapacity
+	}
 	// 时段负荷 = （可用能力 - 剩余能力）/可用能力
 	wloadsrv.WorkLoadPercent = (wloadsrv.AvailCapacity.Seconds() - wloadsrv.RestCapacity.Seconds()) / wloadsrv.AvailCapacity.Seconds()
 	return