版本结束

This commit is contained in:
qianhao.xu
2024-01-31 17:51:45 +08:00
parent a2295ee36d
commit fc162aed3b
9 changed files with 773 additions and 240 deletions

View File

@@ -21,6 +21,7 @@ using System.Drawing;
using Newtonsoft.Json;
using ZR.Model.MES.qu;
using static Microsoft.Extensions.Logging.EventSource.LoggingEventSource;
using ZR.Model.MES.pro;
namespace ZR.Service.MES.op
{
@@ -99,7 +100,7 @@ namespace ZR.Service.MES.op
int totalCount = 0;
var query5 = Context.Queryable<QcFqc>()
.LeftJoin<ProWorkorder>((q, p) => q.FkWorkorderId == p.Id)
.LeftJoin<ProWorkorder_v2>((q, p) => q.FkWorkorderId == p.Id)
.Where(predicate2)
.Select((q, p) => new QcFqcDTO {
Year = p.Year,