From 23b0bc1ffc7f42d12d3ae756e9531a1aee899a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 24 Jun 2025 17:27:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=90=88=E6=A0=BC=EF=BC=8C?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BB=B6=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/qc/gp12/QcGp12ServiceStatisticsService.cs | 6 +++--- ZR.Service/mes/wms/WmOneTimeRecordService.cs | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ZR.Service/mes/qc/gp12/QcGp12ServiceStatisticsService.cs b/ZR.Service/mes/qc/gp12/QcGp12ServiceStatisticsService.cs index cee4f45a..9f86f73b 100644 --- a/ZR.Service/mes/qc/gp12/QcGp12ServiceStatisticsService.cs +++ b/ZR.Service/mes/qc/gp12/QcGp12ServiceStatisticsService.cs @@ -113,15 +113,15 @@ namespace ZR.Service.Business .Create() .AndIF( !string.IsNullOrEmpty(parm.WorkOrder), - x => SqlFunc.Like(x.WorkOrder, parm.WorkOrder + "%") + x => x.WorkOrder.Contains(parm.WorkOrder) ) .AndIF( !string.IsNullOrEmpty(parm.PartNumber), - x => SqlFunc.Like(x.PartNumber, parm.PartNumber + "%") + x => x.PartNumber.Contains(parm.PartNumber) ) .AndIF( !string.IsNullOrEmpty(parm.Description), - x => SqlFunc.Like(x.Description, parm.Description + "%") + x => x.Description.Contains(parm.Description) ) .AndIF(!string.IsNullOrEmpty(parm.Team), x => x.Team == parm.Team) .AndIF(!string.IsNullOrEmpty(parm.SiteNo), x => x.SiteNo == parm.SiteNo) diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs index 5aceb590..8a35dcfe 100644 --- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -5,6 +5,7 @@ using Infrastructure.Attribute; using SqlSugar; using ZR.Model; using ZR.Model.Business; +using ZR.Model.MES.pro; using ZR.Model.MES.qc; using ZR.Model.MES.wms; using ZR.Model.MES.wms.Dto; @@ -283,14 +284,17 @@ namespace ZR.Service.mes.wms // 入库条件1 产线合格品qc_quality_statistics_first，合格数，其中去除（倒车雷达） List qcQualityStatisticsFirsts = Context .Queryable() + .LeftJoin((qsf, wo) => qsf.WorkorderId == wo.ClientWorkorder) .WhereIF( !string.IsNullOrEmpty(parm.Partnumber), - it => it.FinishedPartNumber == parm.Partnumber + (qsf, wo) => qsf.FinishedPartNumber == parm.Partnumber ) - .Where(it => !it.ProductDescription.Contains("倒车雷达")) - .Where(it => it.StartTime >= parm.StartTime) - .Where(it => it.QualifiedNumber > 0) - .Where(it => it.Remark == "抛光") + .Where((qsf, wo) => !qsf.ProductDescription.Contains("倒车雷达")) + .Where((qsf, wo) => qsf.StartTime >= parm.StartTime) + .Where((qsf, wo) => qsf.QualifiedNumber > 0) + .Where((qsf, wo) => qsf.Remark == "抛光") + //XXX过滤维修件 + .Where((qsf, wo) => !wo.Remark1.Contains("维修")) .ToList(); // 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数