RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2025-10-24 10:47:08 +08:00
parent 4d7a58053b
commit c9c48f96bc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
DOAN.Admin.WebApi/wwwroot/ImportTemplate/workorder.xlsx
View File

Binary file not shown.

6
DOAN.Service/MES/product/ProPlanAchievementrateService.cs
View File

@ -58,11 +58,12 @@ namespace DOAN.Service.MES.product
List<ProPlanAchievementrate> AproPlanAchievementrates = Context.Queryable<ProWorkorder>()
.LeftJoin<ProReportwork>((w, r) => w.Workorder == r.FkWorkorder)
.Where((w, r) => w.WorkorderDate == parm.GenarateDate && w.AorBgroup == "A")
.GroupBy((w, r) => new { w.Project, w.AorBgroup, w.Groupleader })
.GroupBy((w, r) => new { w.Project, w.AorBgroup})
.Select((w, r) => new ProPlanAchievementrate()
{
Project = w.Project,
AgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
AgroupMonitor=SqlFunc.AggregateMax(w.Groupleader),
AgroupPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
AgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
//BgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
@ -86,6 +87,7 @@ namespace DOAN.Service.MES.product
//AgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
BgroupProductNum = SqlFunc.AggregateSum(r.FinishedNum),
BgroupPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
BgroupMonitor = SqlFunc.AggregateMax(w.Groupleader),
BgroupCompletionRate = SqlFunc.Round<decimal>((decimal)(SqlFunc.AggregateSum(r.FinishedNum) / SqlFunc.AggregateSum(w.DeliveryNum)), 2) * 100,
SummaryActualNum = SqlFunc.AggregateSum(r.FinishedNum),
SummaryPlanNum = SqlFunc.AggregateSum(w.DeliveryNum),
@ -108,11 +110,13 @@ namespace DOAN.Service.MES.product
AgroupProductNum = a.AgroupProductNum,
AgroupPlanNum = a.AgroupPlanNum,
AgroupCompletionRate = a.AgroupCompletionRate,
AgroupMonitor=a.AgroupMonitor,
// B 组数据
BgroupProductNum = b.BgroupProductNum,
BgroupPlanNum = b.BgroupPlanNum,
BgroupCompletionRate = b.BgroupCompletionRate,
BgroupMonitor=b.BgroupMonitor,
// 汇总数据
SummaryActualNum = (a.SummaryActualNum ?? 0) + (b.SummaryActualNum ?? 0),