diff --git a/services/om/implments/WorkOrder.service.impl.go b/services/om/implments/WorkOrder.service.impl.go index ea1770a..5963e78 100644 --- a/services/om/implments/WorkOrder.service.impl.go +++ b/services/om/implments/WorkOrder.service.impl.go @@ -917,7 +917,7 @@ func (impl *WorkOrderServiceImplement) SyncHronousData(plantNr int, filePath str } } for _, vv := range lst { - ok, err := logdao.SelectOne(vv.ArtId, vv.Pos) + ok, err := logdao.SelectOne(vv.DemandId, vv.Pos) if err != nil { session.Rollback() return err diff --git a/services/schedule/Scheduler.Ctrl.go b/services/schedule/Scheduler.Ctrl.go index 2c8e034..9fb9e66 100644 --- a/services/schedule/Scheduler.Ctrl.go +++ b/services/schedule/Scheduler.Ctrl.go @@ -313,6 +313,10 @@ func (schedsrv *SchedulerSrv) ScheduleTask(worklineid string, task *TaskSrv) (er // 固定计划开始和结束时间 tlinesrv.StartTime = task.SchedStartTime tlinesrv.EndTime = task.SchedEndTime + case common.WO_STATUS_LOCKED: + // 固定计划开始和结束时间 + tlinesrv.StartTime = task.SchedStartTime + tlinesrv.EndTime = task.SchedEndTime case common.WO_STATUS_RELEASED: // 固定计划开始和结束时间 tlinesrv.StartTime = task.SchedStartTime