Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

2023-07-12 08:50:08 +08:00
parent d11304abfa e21dc46a88
commit f07b7235d7
1 changed files with 1 additions and 1 deletions
--- a/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
@@ -189,7 +189,7 @@ namespace Tnb.ProductionMgr
                    plan_end_date = a.estimated_end_date,
                    plan_qty = c.scheduled_qty,
                    //complete_qty = SqlFunc.Subqueryable<PrdReport>().Where(it => it.mo_task_code == a.mo_task_code).Sum(it => it.reported_work_qty),
-                    complete_qty = a.reported_work_qty + a.scrap_qty,
+                    complete_qty = SqlFunc.IsNull(a.reported_work_qty,0) + SqlFunc.IsNull(a.scrap_qty,0),
                    mo_task_status = a.mo_task_status,

                }).ToListAsync();