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

增加完成校验，自检报废记录添加报废人

Browse Source
This commit is contained in:
周科达
2023-07-24 11:24:08 +08:00
parent 9dcf772a08
commit ee2e9ffc3d
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskDefectOutput.cs
View File

@@ -27,6 +27,8 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
public string? batch { get; set; } public string? batch { get; set; }
public string? create_time { get; set; } public string? create_time { get; set; }
public string? create_name { get; set; }
/// <summary> /// <summary>
/// 报废数量 /// 报废数量
/// </summary> /// </summary>

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

@@ -245,13 +245,15 @@ namespace Tnb.ProductionMgr
} }
output.mo_task_code = (await db.Queryable<PrdMoTask>().FirstAsync(it => it.id == moTaskId))?.mo_task_code; output.mo_task_code = (await db.Queryable<PrdMoTask>().FirstAsync(it => it.id == moTaskId))?.mo_task_code;
var defects = await db.Queryable<PrdMoTaskDefect>().Where(it => it.mo_task_id == moTaskId).ToListAsync(); var defects = await db.Queryable<PrdMoTaskDefect>().Where(it => it.mo_task_id == moTaskId).ToListAsync();
var users = await db.Queryable<UserEntity>().ToListAsync();
if (defects?.Count > 0) if (defects?.Count > 0)
{ {
output.batchItems = defects.GroupBy(g => new { g.batch }).Select(t => new BatchItem output.batchItems = defects.GroupBy(g => new { g.batch,g.create_id }).Select(t => new BatchItem
{ {
scrap_qty = t.Sum(d => d.defective_item_qty), scrap_qty = t.Sum(d => d.defective_item_qty),
batch = t.Key.batch, batch = t.Key.batch,
create_time = t.Key.batch.ParseToDateTime().ToString("yyyy-MM-dd HH:mm:ss"), create_time = t.Key.batch.ParseToDateTime().ToString("yyyy-MM-dd HH:mm:ss"),
create_name = users.First(x=>x.Id==t.Key.create_id)?.RealName ?? "",
categoryItems = t.GroupBy(g => g.defective_cagetory_id).Select(c => new CategoryItem categoryItems = t.GroupBy(g => g.defective_cagetory_id).Select(c => new CategoryItem
{ {
name = _dicDefect[c.Key]?.ToString(), name = _dicDefect[c.Key]?.ToString(),
@@ -263,6 +265,7 @@ namespace Tnb.ProductionMgr
}).ToList(), }).ToList(),
}).ToList(), }).ToList(),
}).ToList(); }).ToList();
} }
return output; return output;
} }
@@ -1015,11 +1018,19 @@ namespace Tnb.ProductionMgr
{ {
if (list?.Count > 0) if (list?.Count > 0)
{ {
var schedQtySum = list.Sum(x => x.scheduled_qty); // var schedQtySum = list.Sum(x => x.scheduled_qty);
var planQtySum = list.Sum(x => x.plan_qty); // var planQtySum = list.Sum(x => x.plan_qty);
if (schedQtySum < planQtySum) // if (schedQtySum < planQtySum)
// {
// throw new AppFriendlyException("任务数量必须大于等于生产计划数量,才可完成", 500);
// }
int reportedWorkQty = list.Sum(x => x.reported_work_qty) ?? 0;
int scrapQty = list.Sum(x => x.scrap_qty) ?? 0;
int scheduledQty = list.Sum(x => x.scheduled_qty) ?? 0;
if (scheduledQty >= reportedWorkQty+scrapQty)
{ {
throw new AppFriendlyException("任务数量必须大于等于生产计划数量,才可完成", 500); throw new AppFriendlyException("已完成数量大于等于任务单数量,才可完成", 500);
} }
} }
} }