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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-07-21 17:09:09 +08:00
parent 2141a1bedb 42c57ed97f
commit 8a1ce002fb
4 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -685,7 +685,15 @@ namespace Tnb.ProductionMgr
{
await db.Ado.BeginTranAsync();
row = await db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块
//质检
TriggerPlanEntity entity = new TriggerPlanEntity();
entity.materialid = moTask.material_id;
entity.processid = moTask.process_id;
entity.workid = moTask.workstation_id;
entity.triggerevent = EnumTriggerEvent.首件检新的生产任务;
await _qcCheckPlanService.CreateTask(entity);
#endregion
//根据工单号获取当前工单包含的已排产数
var schedQty = db.Queryable<PrdMoTask>().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty);
@@ -802,6 +810,17 @@ namespace Tnb.ProductionMgr
// }
// }
row = await _db.Insertable(moTask).ExecuteCommandAsync();
#region 质检模块
//质检
TriggerPlanEntity entity = new TriggerPlanEntity();
entity.materialid = moTask.material_id;
entity.processid = moTask.process_id;
entity.workid = moTask.workstation_id;
entity.triggerevent = EnumTriggerEvent.首件检新的生产任务;
await _qcCheckPlanService.CreateTask(entity);
#endregion
var material_h = await _db.Queryable<BasMaterial>().FirstAsync(it => it.id == moTask.material_id);
//添加生产任务操作记录日志
var taskLog = new PrdTaskLog();
@@ -1008,16 +1027,22 @@ namespace Tnb.ProductionMgr
var taskReportLogs = new List<PrdMoTask>();
var prdTaskList = await db.Queryable<PrdMoTask>().Where(it => input.TaskIds.Contains(it.id)).ToListAsync();
if (prdTaskList?.Count > 0)
{
/*
if (prdTaskList.Where(p => p.mo_task_status == "Closed").Count() > 0 && status == "InProgress")
{
foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Closed").ToList())
{
{
#region 质检模块
//质检
if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && status == "InProgress")
{
foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Pause").ToList())
{
TriggerPlanEntity entity = new TriggerPlanEntity();
entity.materialid = task.material_id;
entity.processid = task.process_id;
entity.workid = task.workstation_id;
entity.triggerevent = EnumTriggerEvent.首件检生产任务暂停;
await _qcCheckPlanService.CreateTask(entity);
}
}
*/
#endregion
prdTaskList.ForEach(x => x.mo_task_status = status);
row = await db.Updateable(prdTaskList).ExecuteCommandAsync();
if (row > 0)