质量统计

This commit is contained in:
qianhao.xu
2023-12-12 22:26:20 +08:00
parent 3429a1e39e
commit 21ceea2a5b
14 changed files with 510 additions and 14 deletions

View File

@@ -13,6 +13,12 @@ using ZR.Service.MES.op.IService;
using ZR.Model.MES.op.DTO;
using Microsoft.AspNetCore.Http.HttpResults;
using Org.BouncyCastle.Asn1.Esf;
using ZR.Model.MES.qc;
using SqlSugar;
using ZR.Model.mes.pro;
using static System.Runtime.InteropServices.JavaScript.JSType;
using System.Drawing;
using Newtonsoft.Json;
namespace ZR.Service.MES.op
{
@@ -65,6 +71,50 @@ namespace ZR.Service.MES.op
return OpStatisticsDTOList;
}
public (List<QcFqcDTO>,int) GueryQualityStatistics(string workorderid ,int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
var predicate = Expressionable.Create<QcFqcDTO>()
.AndIF(year > 0, p => p.Year == year)
.AndIF(week > 0, p => p.Week == week)
.AndIF(date > 0, p => p.Date == date)
.ToExpression();
var predicate2 = Expressionable.Create<QcFqc>()
.AndIF(!string.IsNullOrEmpty(workorderid),q=>q.FkWorkorderId== workorderid)
.ToExpression();
int totalCount = 0;
var query5 = Context.Queryable<QcFqc>()
.LeftJoin<ProWorkorder>((q, p) => q.FkWorkorderId == p.Id)
.Where(predicate2)
.Select((q, p) => new QcFqcDTO {
Year = p.Year,
Week = p.Week,
Date = p.Date,
Id = q.Id,
FkWorkorderId = q.FkWorkorderId,
ProductName = q.ProductName,
Color = q.Color,
Require = q.Require,
LeftRight = q.LeftRight,
Team = q.Team,
QualifiedNum01 = q.QualifiedNum01,
DefectNum01 = q.DefectNum01,
PolishNum01 = q.PolishNum01,
ScrapNum01 = q.ScrapNum01,
QualifiedNum02 = q.QualifiedNum02,
PolishNum02 = q.PolishNum02,
ScrapNum02 = q.ScrapNum02,
QualifiedNum03 = q.QualifiedNum03,
PolishNum03 = q.PolishNum03,
ScrapNum03 = q.ScrapNum03,
}).MergeTable();
List<QcFqcDTO> QcFqcDTOList = query5.Where(predicate).ToPageList(pageNum, pageSize,ref totalCount);
return (QcFqcDTOList, totalCount);
}
}
}