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

bug

Browse Source
This commit is contained in:
周科达
2023-06-20 09:49:21 +08:00
parent b72d42d8d9
commit 8e44d842c2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
View File

@@ -67,14 +67,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
/// </summary> /// </summary>
public int? plan_qty { get; set; } public int? plan_qty { get; set; }
public int? scheduled_qty { get; set; } public int? scheduled_qty { get; set; }
/// <summary> /// <summary>
/// 预计开工时间 /// 预计开工时间
/// </summary> /// </summary>
public DateTime? estimated_start_date { get; set; } public string estimated_start_date { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 预计完工时间 /// 预计完工时间
/// </summary> /// </summary>
public DateTime? estimated_end_date { get; set; } public string estimated_end_date { get; set; }= string.Empty;
/// <summary> /// <summary>
/// 工序编码 /// 工序编码
/// </summary> /// </summary>

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

@@ -301,8 +301,8 @@ namespace Tnb.ProductionMgr
eqp_name = e.name, eqp_name = e.name,
eqp_type_code = SqlFunc.Subqueryable<EqpEquipType>().Where(it => it.id == e.equip_type_id).Select(it => it.code), eqp_type_code = SqlFunc.Subqueryable<EqpEquipType>().Where(it => it.id == e.equip_type_id).Select(it => it.code),
mo_task_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(a => a.mo_id == moId).Count(), mo_task_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(a => a.mo_id == moId).Count(),
estimated_start_date = a.estimated_start_date, estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH"),
estimated_end_date = a.estimated_end_date, estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH"),
plan_qty = a.scheduled_qty, plan_qty = a.scheduled_qty,
complete_qty = a.complete_qty, complete_qty = a.complete_qty,
process_code = SqlFunc.Subqueryable<BasProcess>().Where(it => it.id == a.process_id).Select(it => it.process_code), process_code = SqlFunc.Subqueryable<BasProcess>().Where(it => it.id == a.process_id).Select(it => it.process_code),
@@ -329,9 +329,9 @@ namespace Tnb.ProductionMgr
material_code = c.code, material_code = c.code,
material_name = c.name, material_name = c.name,
mo_task_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(a => a.mo_id == moId).Count(), mo_task_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(a => a.mo_id == moId).Count(),
estimated_start_date = a.estimated_start_date, estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH"),
estimated_end_date = a.estimated_end_date, estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH"),
plan_qty = b.plan_qty, plan_qty = b.scheduled_qty,
complete_qty = a.complete_qty, complete_qty = a.complete_qty,
}) })
.Mapper(it => .Mapper(it =>