diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
index c0a9d030..e714bb9b 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs
@@ -67,14 +67,15 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
///
public int? plan_qty { get; set; }
public int? scheduled_qty { get; set; }
+
///
/// 预计开工时间
///
- public DateTime? estimated_start_date { get; set; }
+ public string estimated_start_date { get; set; } = string.Empty;
///
/// 预计完工时间
///
- public DateTime? estimated_end_date { get; set; }
+ public string estimated_end_date { get; set; }= string.Empty;
///
/// 工序编码
///
diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index a1ae4e79..4561e5c0 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -301,8 +301,8 @@ namespace Tnb.ProductionMgr
eqp_name = e.name,
eqp_type_code = SqlFunc.Subqueryable().Where(it => it.id == e.equip_type_id).Select(it => it.code),
mo_task_qty = SqlFunc.Subqueryable().Where(a => a.mo_id == moId).Count(),
- estimated_start_date = a.estimated_start_date,
- estimated_end_date = a.estimated_end_date,
+ estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH"),
+ estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH"),
plan_qty = a.scheduled_qty,
complete_qty = a.complete_qty,
process_code = SqlFunc.Subqueryable().Where(it => it.id == a.process_id).Select(it => it.process_code),
@@ -329,9 +329,9 @@ namespace Tnb.ProductionMgr
material_code = c.code,
material_name = c.name,
mo_task_qty = SqlFunc.Subqueryable().Where(a => a.mo_id == moId).Count(),
- estimated_start_date = a.estimated_start_date,
- estimated_end_date = a.estimated_end_date,
- plan_qty = b.plan_qty,
+ estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH"),
+ estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH"),
+ plan_qty = b.scheduled_qty,
complete_qty = a.complete_qty,
})
.Mapper(it =>