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:
DEVICE8\12494
2023-05-25 22:51:56 +08:00
parent 5601d3a186
commit 7dcb35b455
11 changed files with 272 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@ namespace Tnb.ProductionMgr
.Where((a, b, c) => a.material_id == materialId)
.Select((a, b, c) => new Tnb.ProductionMgr.Entities.Dto.MoldListOutput
{
mold_id = a.id,
mold_id = b.id,
mold_code = b.mold_code,
mold_name = b.mold_name,
mold_type_code = b.mold_type_code,
@@ -217,71 +217,6 @@ namespace Tnb.ProductionMgr
return data;
}
/// <summary>
/// 根据任务单号获取提报记录明细
/// </summary>
/// <param name="icmoCode">任务单号</param>
/// <remarks>
/// returns:
///<br/> {
///<br/> icmo_qty:任务计划数量
///<br/> reported_work_qty:已报工数量
///<br/> reported_qty:报工数量
///<br/> prd_qty:生产数量
///<br/> }
/// </remarks>
[HttpGet("{mo_task_code}")]
public async Task<dynamic> GetPrdReportByIcmoCode(string mo_task_code)
{
var db = _repository.AsSugarClient();
var prdTask = await db.Queryable<PrdMoTask>().FirstAsync(it => it.mo_task_code == mo_task_code);
var eqpCode = "";
var moldCode = "";
var materialCode = "";
var materialName = "";
var materialProp = "";
if (prdTask != null)
{
var eqp = await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == prdTask.eqp_id);
var mold = await db.Queryable<ToolMolds>().FirstAsync(it => it.id == prdTask.mold_id);
var material = await db.Queryable<BasMaterial>().FirstAsync(it => it.id == prdTask.material_id);
eqpCode = eqp != null ? eqp.code : "";
moldCode = mold != null ? mold.mold_code : "";
materialCode = material != null ? material.code : "";
materialName = material != null ? material.name : "";
materialProp = material != null ? material.material_property : "";
}
var res = await db.Queryable<PrdReport>().Where(it => it.mo_task_code == mo_task_code)
.Select(it => new PrdReportOutput
{
icmo_qty = it.icmo_qty,
reported_work_qty = it.reported_work_qty,
eqp_code = eqpCode,
mold_code = moldCode,
material_code = materialCode,
material_name = materialName,
prd_qty = it.prd_qty,
scrap_qty = SqlFunc.Subqueryable<PrdMoTaskDefect>().Where(pmtd => pmtd.mo_task_id == it.mo_task_id).Select(x => x.scrap_qty),
})
.Mapper(it =>
{
it.icmo_qty = it.icmo_qty ?? (db.Queryable<PrdTask>().First(it => it.icmo_code == mo_task_code)?.scheduled_qty < 1 ? 0 : it.icmo_qty ?? db.Queryable<PrdTask>().First(it => it.icmo_code == mo_task_code).scheduled_qty);
it.reported_work_qty = it.reported_work_qty ?? 0;
//it.reported_qty = it.reported_qty ?? 0;
it.prd_qty = it.prd_qty ?? 0;
it.scrap_qty = it.scrap_qty ?? 0;
})
.FirstAsync();
res ??= new PrdReportOutput
{
icmo_qty = db.Queryable<PrdMoTask>().First(it => it.mo_task_code == mo_task_code)?.scheduled_qty,
reported_work_qty = 0,
prd_qty = 0,
scrap_qty = 0,
};
return res;
}
/// <summary>
/// 获取自检报废批次记录
/// </summary>
/// <param name="moTaskId">任务单Id</param>
@@ -343,7 +278,6 @@ namespace Tnb.ProductionMgr
[HttpGet("{moId}")]
public async Task<dynamic> GetPrdTaskInfoByMoId(string moId, int schedType = 1)
{
List<PrdMoTaskOutput> result = new();
var dic = await _dictionaryDataService.GetDicByTypeId(DictConst.PrdTaskStatusTypeId);
if (schedType == 1)
@@ -369,6 +303,8 @@ namespace Tnb.ProductionMgr
estimated_end_date = a.estimated_end_date,
plan_qty = b.plan_qty,
complete_qty = a.complete_qty,
process_code = SqlFunc.Subqueryable<BasProcess>().Where(it => it.id == a.process_id).Select(it => it.process_code),
process_name = SqlFunc.Subqueryable<BasProcess>().Where(it => it.id == a.process_id).Select(it => it.process_name),
})
.Mapper(it =>
{
@@ -381,7 +317,7 @@ namespace Tnb.ProductionMgr
result = await _db.Queryable<PrdMoTask>().LeftJoin<PrdMo>((a, b) => a.mo_id == b.id)
.LeftJoin<BasMaterial>((a, b, c) => a.material_id == c.id)
.LeftJoin<OrganizeEntity>((a, b, c, d) => a.workline_id == d.Id)
.Where((a, b, c, d) => a.mo_id == moId && string.IsNullOrEmpty(a.parent_id))
.Where((a, b, c, d) => b.id == moId || b.parent_id == moId)
.Select((a, b, c, d) => new PrdMoTaskOutput
{
mo_task_code = a.mo_task_code,
@@ -505,8 +441,12 @@ namespace Tnb.ProductionMgr
node.material_id_id = materialId;
node.material_code = material?.code;
node.material_name = material?.name;
node.material_standard = material?.material_standard;
}
//
var scheldQtyCol = nameof(PrdMo.scheduled_qty);
node.scheduled_qty = _db.Queryable<PrdMoTask>().Where(it => it.mo_id == dic["id"].ToString()).Sum(it => it.scheduled_qty)?.ToString();
var queryObj = new { parent_id = node.id };
input.superQueryJson = "";
input.queryJson = queryObj.ToJsonString();
@@ -527,7 +467,9 @@ namespace Tnb.ProductionMgr
subNode.material_id_id = materialId;
subNode.material_code = material?.code;
subNode.material_name = material?.name;
subNode.material_standard = material?.material_standard;
}
node.scheduled_qty = _db.Queryable<PrdMoTask>().Where(it => it.mo_id == dic["id"].ToString()).Sum(it => it.scheduled_qty)?.ToString();
childNodes.Add(subNode);
}
trees.AddRange(childNodes);
@@ -696,6 +638,7 @@ namespace Tnb.ProductionMgr
moTask.id = SnowflakeIdHelper.NextId();
moTask.create_id = _userManager.UserId;
moTask.bom_id = input.bom_id;
moTask.workroute_id = (await _db.Queryable<BasMbom>().FirstAsync(it => it.id == input.bom_id))?.route_id;
moTask.workline_id = input.workline_id;
moTask.create_time = DateTime.Now;
moTask.schedule_type = 2;
@@ -726,7 +669,7 @@ namespace Tnb.ProductionMgr
}
row = await _db.Insertable(moTask).ExecuteCommandAsync();
var material_h = await _db.Queryable<BasMaterial>().FirstAsync(it => it.id == moTask.material_id);
//添加生产任务操作记录日志s
//添加生产任务操作记录日志
var taskLog = new PrdTaskLog();
taskLog.id = SnowflakeIdHelper.NextId();
taskLog.mo_code = (await _db.Queryable<PrdMo>().FirstAsync(it => it.id == input.mo_id))?.mo_code!;
@@ -775,43 +718,41 @@ namespace Tnb.ProductionMgr
}
}
}
//根据生产bomId 拆解生产子任务
var outputList = new List<PackingSchedulingListOutput>();
var subTaskList = await _db.Queryable<BasMbom>()
.LeftJoin<BasMbomProcess>((a, b) => a.id == b.mbom_id)
.LeftJoin<BasRouteH>((a, b, c) => a.route_id == c.id)
.LeftJoin<BasRouteD>((a, b, c, d) => b.process_id == d.process_id && c.id == d.route_id)
.LeftJoin<BasMbomOutput>((a, b, c, d, e) => a.id == e.mbom_id && e.mbom_process_id == b.id)
.Where((a, b, c, d, e) => a.id == input.bom_id && d.ordinal < SqlFunc.Subqueryable<BasRouteD>().Where(it => it.route_id == a.route_id).OrderByDesc(it => it.ordinal).Select(it => it.ordinal))
.Select((a, b, c, d, e) => new SubBomListOutput
{
version = a.version,
unit_id = a.unit_id,
route_id = c.id,
route_name = c.name,
process_id = b.process_id,
material_id = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.id),
num = e.num,
ordinal = d.ordinal,
})
.Mapper(it => it.output_qty = it.num.ParseToInt())
.ToListAsync();
.LeftJoin<BasMbomProcess>((a, b) => a.id == b.mbom_id)
.LeftJoin<BasRouteH>((a, b, c) => a.route_id == c.id)
.LeftJoin<BasRouteD>((a, b, c, d) => b.process_id == d.process_id && c.id == d.route_id)
.LeftJoin<BasMbomOutput>((a, b, c, d, e) => a.id == e.mbom_id && e.mbom_process_id == b.id)
.Where((a, b, c, d, e) => a.id == input.bom_id)
.Select((a, b, c, d, e) => new SubBomListOutput
{
version = a.version,
unit_id = a.unit_id,
route_id = c.id,
process_id = b.process_id,
material_id = SqlFunc.Subqueryable<BasMaterial>().Where(it => it.id == e.material_id).Select(it => it.id),
num = e.num,
ordinal = d.ordinal,
})
.Mapper(it => it.output_qty = it.num.ParseToInt())
.ToListAsync();
if (subTaskList?.Count > 0)
{
List<PrdMoTask> subMoTasks = new();
foreach (var item in subTaskList)
{
PrdMoTask subMoTask = new();
subMoTask.schedule_type = 2;
subMoTask.mo_task_status = DictConst.ToBeScheduledEncode;
subMoTask.parent_id = moTask.id;
subMoTask.mo_id = input.mo_id;
//subMoTask.bom_id = input.bom_id;
subMoTask.material_id = item.material_id;
subMoTask.schedule_type = 2;
subMoTask.parent_id = moTask.id;
subMoTask.bom_id = input.bom_id;
subMoTask.process_id = item.process_id;
subMoTask.mo_task_status = DictConst.ToBeScheduledEncode;
subMoTask.workroute_id = item.route_id;
subMoTask.workline_id = input.workline_id;
subMoTask.material_id = item.material_id;
subMoTask.workroute_id = item.route_id;
subMoTask.scheduled_qty = item.output_qty * moTask.scheduled_qty;
subMoTask.scheduled_qty = input.scheduled_qty;
subMoTask.process_task_qty = item.output_qty * moTask.scheduled_qty;
subMoTask.estimated_start_date = input.estimated_start_date;
subMoTask.estimated_end_date = input.estimated_end_date;
@@ -830,45 +771,6 @@ namespace Tnb.ProductionMgr
}
row = await _db.Insertable(subMoTasks).ExecuteCommandAsync();
}
#region 注释代码
//var bom = await _db.Queryable<BasMbom>().FirstAsync(it => it.id == input.bom_id);
//if (bom != null && bom.route_id.IsNotEmptyOrNull())
//{
// var mbomProcesses = await _db.Queryable<BasMbomProcess>().Where(it => it.mbom_id == bom.id).ToListAsync();
// var routes = await _db.Queryable<BasRouteD>().Where(it => it.route_id == bom.route_id).ToListAsync();
// if (routes?.Count > 0)
// {
// var processIds = routes.Select(x => x.process_id).ToList();
// if (processIds?.Count > 0)
// {
// var bomOutputs = await _db.Queryable<BasMbomOutput>().Where(it => processIds.Contains(it.process_id)).ToListAsync();
// if (bomOutputs?.Count > 0)
// {
// List<PrdMoTask> subMoTasks = new();
// foreach (var item in bomOutputs)
// {
// var material = await _db.Queryable<BasMaterial>().FirstAsync(it => it.id == item.material_id);
// PrdMoTask subMoTask = new();
// subMoTask.id = SnowflakeIdHelper.NextId();
// subMoTask.schedule_type = 2;
// subMoTask.parent_id = moTask.id;
// subMoTask.bom_id = input.bom_id;
// subMoTask.mo_task_status = DictConst.ToBeScheduledEncode;
// subMoTask.workline_id = input.workline_id;
// subMoTask.material_id = item.material_id;
// subMoTask.process_task_qty = item.num.ParseToInt() * moTask.scheduled_qty;
// subMoTask.estimated_start_date = input.estimated_start_date;
// subMoTask.estimated_end_date = input.estimated_end_date;
// subMoTask.create_id = _userManager.UserId;
// subMoTask.create_time = DateTime.Now;
// subMoTasks.Add(subMoTask);
// }
// }
// }
// }
//}
#endregion
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)
@@ -1088,7 +990,13 @@ namespace Tnb.ProductionMgr
var record = prdTask.Adapt<PrdReportRecord>();
if (prdTask != null)
{
var material = (await db.Queryable<BasMaterial>().FirstAsync(it => it.id == prdTask.material_id));
record.id = SnowflakeIdHelper.NextId();
record.masterial_code = material?.code;
record.masterial_name = material?.name;
record.plan_start_date = prdTask.estimated_start_date;
record.plan_end_date = prdTask.estimated_end_date;
record.plan_qty = prdTask.plan_qty;
record.eqp_code = (await db.Queryable<EqpEquipment>().FirstAsync(it => it.id == prdTask.eqp_id))?.code;
record.completed_qty = input.reported_qty;
row = await db.Insertable(record).ExecuteCommandAsync();
@@ -1202,11 +1110,12 @@ namespace Tnb.ProductionMgr
if (outMaterials?.Count > 0)
{
var mids = await _db.Queryable<PrdMo>().Where(it => it.id == input.mo_id).Select(it => it.material_id).ToListAsync();
var ids = outMaterials.Select(x => x.material_id).Except(mids).ToList();
//var mids = await _db.Queryable<PrdMo>().Where(it => it.id == input.mo_id).Select(it => it.material_id).ToListAsync();
var ids = outMaterials.Select(x => x.material_id).ToList();
await _db.Deleteable<PrdMo>().Where(it => it.parent_id == input.mo_id).ExecuteCommandAsync();
if (ids?.Count > 0)
{
var dicOutMaterialNum = outMaterials.ToDictionary(x => x.material_id, x => x.num.ParseToInt());
var dicOutMaterialNum = outMaterials.DistinctBy(x => x.material_id).ToDictionary(x => x.material_id, x => x.num.ParseToInt());
List<PrdMo> subMoList = new();
var outputMaterials = await _db.Queryable<BasMaterial>().Where(it => ids.Contains(it.id)).ToListAsync();
foreach (var om in outputMaterials)