diff --git a/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs b/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs index 1b0b300b..2e9cd054 100644 --- a/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs +++ b/taskschedule/Tnb.TaskScheduler/Listener/QcTaskTimeWorker.cs @@ -24,33 +24,34 @@ namespace Tnb.TaskScheduler.Listener /// public class QcTaskTimeWorker : ISpareTimeWorker { - private ISqlSugarRepository repository => App.GetService>(); + private ISqlSugarClient repository => App.GetService(); + [SpareTime("0 0 0 * * ?", "生成质检任务", ExecuteType = SpareTimeExecuteTypes.Serial, StartNow = false)] public async void CreateTask(SpareTimer timer, long count) { - var timeTaskEntity = await repository.AsSugarClient().Queryable().Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).FirstAsync(); + var timeTaskEntity = await repository.Queryable().Where(p => p.Id == timer.WorkerName && p.EnabledMark == 1).FirstAsync(); if (timeTaskEntity == null) return; ContentModel? comtentModel = timeTaskEntity.ExecuteContent.ToObject(); - var PlanH = await repository.AsQueryable().Where(p => p.id == comtentModel.parameter.Where(p => p.field == "id").First().value).FirstAsync(); - var PlanDs = await repository.AsSugarClient().Queryable().Where(p => p.mainid == timeTaskEntity.Description).ToListAsync(); + var PlanH = await repository.Queryable().Where(p => p.id == comtentModel.parameter.Where(p => p.field == "id").First().value).FirstAsync(); + var PlanDs = await repository.Queryable().Where(p => p.mainid == PlanH.id).ToListAsync(); if (PlanH == null || PlanDs.Count == 0) return; - var PlanMaterials = repository.AsSugarClient().Queryable().Where(p => p.planid == PlanH.id).Select(p => p.materialid).ToList(); - var PlanProcesss = repository.AsSugarClient().Queryable().Where(p => p.planid == PlanH.id).Select(p => p.processid).ToList(); - var PlanWork = repository.AsSugarClient().Queryable().Where(p => p.planid == PlanH.id).Select(p => p.workid).ToList(); + var PlanMaterials = repository.Queryable().Where(p => p.planid == PlanH.id).Select(p => p.materialid).ToList(); + var PlanProcesss = repository.Queryable().Where(p => p.planid == PlanH.id).Select(p => p.processid).ToList(); + var PlanWork = repository.Queryable().Where(p => p.planid == PlanH.id).Select(p => p.workid).ToList(); //物料工序工位不能同时为空 if (PlanMaterials.Count == 0 && PlanProcesss.Count == 0 && PlanWork.Count == 0) return; - var PrdMoTasks = await repository.AsSugarClient().Queryable() + var PrdMoTasks = await repository.Queryable() .WhereIF(PlanMaterials.Count > 0, p => PlanMaterials.Contains(p.material_id)) .WhereIF(PlanProcesss.Count > 0, p => PlanProcesss.Contains(p.process_id)) .WhereIF(PlanWork.Count > 0, p => PlanWork.Contains(p.workstation_id)) .Where(p => p.mo_task_status == "InProgress")//进行中 .ToListAsync(); - var DictionaryType = await repository.AsSugarClient().Queryable().Where(p => p.FullName == "质检状态").FirstAsync(); - var DictionaryData = await repository.AsSugarClient().Queryable().Where(p => p.DictionaryTypeId == DictionaryType.Id && p.FullName == "待执行").FirstAsync(); + var DictionaryType = await repository.Queryable().Where(p => p.FullName == "质检状态").FirstAsync(); + var DictionaryData = await repository.Queryable().Where(p => p.DictionaryTypeId == DictionaryType.Id && p.FullName == "待执行").FirstAsync(); foreach (var PrdMoTask in PrdMoTasks) { QcCheckExecH qcCheckExecH = new QcCheckExecH(); @@ -79,15 +80,15 @@ namespace Tnb.TaskScheduler.Listener QcCheckExecD.itemid = PlanD.itemid; ExecDs.Add(QcCheckExecD); } - await repository.AsSugarClient().Insertable(qcCheckExecH).ExecuteCommandAsync(); - await repository.AsSugarClient().Insertable(ExecDs).ExecuteCommandAsync(); + await repository.Insertable(qcCheckExecH).ExecuteCommandAsync(); + await repository.Insertable(ExecDs).ExecuteCommandAsync(); } //只执行一次的 修改EnabledMark字段 var InterfaceParameter = comtentModel.parameter.Where(p => p.field == "doonce").FirstOrDefault(); if (InterfaceParameter != null && bool.Parse(InterfaceParameter.value)) { timeTaskEntity.EnabledMark = 0; - await repository.AsSugarClient().Updateable(timeTaskEntity).ExecuteCommandAsync(); + await repository.Updateable(timeTaskEntity).ExecuteCommandAsync(); SpareTime.Cancel(timeTaskEntity.Id); } diff --git a/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs b/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs index b2ad1f7f..41e779a2 100644 --- a/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs +++ b/taskschedule/Tnb.TaskScheduler/TimeTaskService.cs @@ -230,9 +230,8 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie var entitys = await _repository.AsQueryable().Where(p=>p.FullName==fullName).ToListAsync(); foreach (var entity in entitys) { - var isOk = await _repository.AsUpdateable(entity).CallEntityMethod(m => m.Delete()).UpdateColumns(it => new { it.DeleteMark, it.DeleteTime, it.DeleteUserId }).ExecuteCommandHasChangeAsync(); - if (!isOk) - throw Oops.Oh(ErrorCode.COM1002); + await _repository.AsSugarClient().Deleteable(entity).ExecuteCommandAsync(); + // 从调度器里取消 SpareTime.Cancel(entity.Id); }