wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-06-27 17:14:20 +08:00
parent 28ef632767 22b1b80b1e
commit 91c451cfc5
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -1076,8 +1076,9 @@ namespace Tnb.ProductionMgr
throw new ArgumentException($"{nameof(input.Behavior)} not be null or empty"); throw new ArgumentException($"{nameof(input.Behavior)} not be null or empty");
} }
ISqlSugarClient db = _repository.AsSugarClient(); ISqlSugarClient db = _repository.AsSugarClient();
DbResult<bool> result = await db.Ado.UseTranAsync(async () => try
{ {
await db.Ado.BeginTranAsync();
List<PrdMoTask> prdTaskList = new List<PrdMoTask>(); List<PrdMoTask> prdTaskList = new List<PrdMoTask>();
//var taskList = await _db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id) && it.mo_task_status == DictConst.ToBeScheduledEncode).ToListAsync(); //var taskList = await _db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id) && it.mo_task_status == DictConst.ToBeScheduledEncode).ToListAsync();
//if (taskList?.Count > 0) //if (taskList?.Count > 0)
@@ -1477,11 +1478,17 @@ namespace Tnb.ProductionMgr
} }
} }
} }
});
if (!result.IsSuccess) await db.Ado.CommitTranAsync();
throw Oops.Bah(result.ErrorMessage); }
return result.IsSuccess ? "保存成功" : result.ErrorMessage; catch (Exception e)
{
Log.Error(e.Message,e);
await db.Ado.RollbackTranAsync();
throw Oops.Bah(e.Message);
}
return "保存成功";
} }
/// <summary> /// <summary>

2
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -295,7 +295,7 @@ namespace Tnb.ProductionMgr
) )
)) ))
{ {
Log.Error($"{equipment.name}存在待下发的任务"); Log.Error($"{equipment.name}存在未完成的任务");
continue; continue;
} }
bool? value = await _redisData.TryGetValueByKeyField<bool?>(eqpDaq.equip_code, eqpDaq.label_name); bool? value = await _redisData.TryGetValueByKeyField<bool?>(eqpDaq.equip_code, eqpDaq.label_name);