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-08-11 17:04:05 +08:00
parent b25ab2c526
commit 53db402c7a
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReport.cs
View File

@@ -113,4 +113,10 @@ public partial class PrdReport : BaseEntity<string>
/// 物料单位 /// 物料单位
/// </summary> /// </summary>
public string? unit_id { get; set; } public string? unit_id { get; set; }
/// <summary>
/// 工序id
/// </summary>
public string? process_id { get; set; }
} }

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

@@ -1364,6 +1364,7 @@ namespace Tnb.ProductionMgr
var row = -1; var row = -1;
var report = await db.Queryable<PrdReport>().FirstAsync(it => it.mo_task_id == input.mo_task_id); var report = await db.Queryable<PrdReport>().FirstAsync(it => it.mo_task_id == input.mo_task_id);
var prdMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.mo_task_id); var prdMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.mo_task_id);
var mbomProcess = await db.Queryable<BasMbomProcess>().SingleAsync(x => x.id == prdMoTask.mbom_process_id);
if (prdMoTask.mo_task_status == DictConst.MoStatusPauseCode) if (prdMoTask.mo_task_status == DictConst.MoStatusPauseCode)
{ {
@@ -1409,6 +1410,7 @@ namespace Tnb.ProductionMgr
report.status = 0; report.status = 0;
report.material_id = prdMoTask.material_id; report.material_id = prdMoTask.material_id;
report.unit_id = prdMoTask.unit_id; report.unit_id = prdMoTask.unit_id;
report.process_id = mbomProcess?.process_id ?? "";
row = await db.Insertable(report).ExecuteCommandAsync(); row = await db.Insertable(report).ExecuteCommandAsync();
@@ -1444,7 +1446,6 @@ namespace Tnb.ProductionMgr
if (prdMoTask.schedule_type == 2 && !string.IsNullOrEmpty(prdMoTask.mbom_process_id)) if (prdMoTask.schedule_type == 2 && !string.IsNullOrEmpty(prdMoTask.mbom_process_id))
{ {
var mbomProcess = await db.Queryable<BasMbomProcess>().SingleAsync(x => x.id == prdMoTask.mbom_process_id);
if (mbomProcess.is_last==1 && prdMoTask != null && !string.IsNullOrEmpty(prdMoTask.parent_id)) if (mbomProcess.is_last==1 && prdMoTask != null && !string.IsNullOrEmpty(prdMoTask.parent_id))
{ {
var parentMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id); var parentMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == prdMoTask.parent_id);