From d8e7b999e0f487edd668676cc31f3706d9881e20 Mon Sep 17 00:00:00 2001 From: Carl Date: Sun, 29 Mar 2026 11:12:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=88=B6=E5=93=81=E5=8F=8A=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整在制品、机加工、研磨的统计方式： - 总在制品由“工序ID≤70”改为“工序ID≠70” - 机加工由工序类型关键字改为“工序ID=20” - 研磨由工序类型关键字改为“工序ID=40” --- .../MES/Product/ProWorkorderMaterialService.cs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs b/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs index 899257b..135c8ae 100644 --- a/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs +++ b/DOAN.Service/MES/Product/ProWorkorderMaterialService.cs @@ -805,24 +805,20 @@ namespace DOAN.Service.MES.product } // 总在制品（排除最终工序 70） - var wipSum = reportQuery.Where(r => r.ProcessId <= 70).Sum(r => r.FinishNum) ?? 0; + var wipSum = reportQuery.Where(r => r.ProcessId != 70).Sum(r => r.FinishNum) ?? 0; - // 机加工在制品：BaseWorkProcesses.DictWorkType 包含关键字的报工总和 + // 机加工在制品：ProcessId == 20 的报工总和 var machiningSum = Context .Queryable() .WhereIF(parm.StartTime != DateTime.MinValue && parm.EndTime != DateTime.MinValue, r => r.JobDateTime >= parm.StartTime && r.JobDateTime <= parm.EndTime) - .Where(r => SqlFunc.Subqueryable() - .Where(p => p.Id == r.ProcessId && (p.DictWorkType.Contains("机") || p.DictWorkType.Contains("machin"))) - .Any()) + .Where(r => r.ProcessId == 20) .Sum(r => r.FinishNum) ?? 0; - // 研磨在制品：DictWorkType 包含关键字的报工总和 + // 研磨在制品：ProcessId == 40 的报工总和 var grindingSum = Context .Queryable() .WhereIF(parm.StartTime != DateTime.MinValue && parm.EndTime != DateTime.MinValue, r => r.JobDateTime >= parm.StartTime && r.JobDateTime <= parm.EndTime) - .Where(r => SqlFunc.Subqueryable() - .Where(p => p.Id == r.ProcessId && (p.DictWorkType.Contains("研") || p.DictWorkType.Contains("grind"))) - .Any()) + .Where(r => r.ProcessId == 40) .Sum(r => r.FinishNum) ?? 0; result.FinishedProductStockTotal = total;