RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

一次合格，维修件过滤

Browse Source
This commit is contained in:
赵正易 2025-06-24 17:27:41 +08:00
parent 3858c7af34
commit 23b0bc1ffc
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Service/mes/qc/gp12/QcGp12ServiceStatisticsService.cs
View File

@ -113,15 +113,15 @@ namespace ZR.Service.Business
.Create<QcGp12ServiceStatistics>()
.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)

14
ZR.Service/mes/wms/WmOneTimeRecordService.cs
View File

@ -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<QcQualityStatisticsFirst> qcQualityStatisticsFirsts = Context
.Queryable<QcQualityStatisticsFirst>()
.LeftJoin<ProWorkorder_v2>((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 合格数