diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
index 8a0f1357..d4e57270 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
@@ -315,10 +315,10 @@ namespace Tnb.ProductionMgr
                                            eqp_name = e.name,
                                            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(),
-                                           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"),
+                                           estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+                                           estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"),
                                            plan_qty = a.scheduled_qty,
-                                           complete_qty = a.complete_qty,
+                                           complete_qty = SqlFunc.IsNull(a.reported_work_qty,0)+SqlFunc.IsNull(a.scrap_qty,0),
                                            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),
                                        })
@@ -346,10 +346,10 @@ namespace Tnb.ProductionMgr
                                            process_code = e.process_code,
                                            process_name = e.process_name,
                                            mo_task_qty = SqlFunc.Subqueryable<PrdMoTask>().Where(a => a.mo_id == moId).Count(),
-                                           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"),
+                                           estimated_start_date = a.estimated_start_date.Value.ToString("yyyy-MM-dd HH:mm:ss"),
+                                           estimated_end_date = a.estimated_end_date.Value.ToString("yyyy-MM-dd HH:mm:ss"),
                                            plan_qty = a.scheduled_qty,
-                                           complete_qty = a.complete_qty,
+                                           complete_qty = SqlFunc.IsNull(a.reported_work_qty,0)+SqlFunc.IsNull(a.scrap_qty,0),
                                        })
                                        .Mapper(it =>
                                        {