From 03c89cb192a63a5d6b4725e68c90a7e4c92e074e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 01 三月 2025 09:13:39 +0800
Subject: [PATCH] 11
---
StandardPda/MES.Service/service/QC/LljService.cs | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 5e571dc..fd7a432 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -4,6 +4,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
using SqlSugar;
using DbType = System.Data.DbType;
@@ -27,20 +28,37 @@
var itemIds = GetQaItem(db, queryObj.createUser);
- var pageList = db.Queryable<LtsLlj>()
+ var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01, SysUser>((a, b, c,d,e) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
+ JoinType.Left, b.Sid == c.Fid,
+ JoinType.Inner, a.Id == d.Id,
+ JoinType.Left, a.CreateBy == e.Fcode
+ ))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu == null)
+ (a, b, c) => a.FcheckResu == null )
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- a => a.FcheckResu != null)
+ (a, b, c) => a.FcheckResu != null)
.WhereIF(
itemIds is { Length: > 0 },
- a => itemIds.Contains(a.ItemId))
- .WhereIF(id > 0, a => a.Id == id)
- .OrderByDescending(a => a.Id)
+ (a, b, c) => itemIds.Contains(a.ItemId))
+ .WhereIF(id > 0, (a, b, c) => a.Id == id)
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (a) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .OrderByDescending((a, b, c) => a.Id)
+ .Select((a, b, c, d,e) => new LtsLlj
+ {
+ UserName = c.Fname,
+ FIRST=d.First,
+ CreateUserName=e.Fname
+ }, true)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
return (pageList, totalCount);
@@ -253,7 +271,8 @@
a.FspecRequ,
a.FreQty,
a.CheckQyt,
- a.FcheckResu
+ a.FcheckResu,
+ a.FcheckItemDesc
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -272,7 +291,8 @@
Factory = "1000",
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
- FcheckResu = a.FcheckResu
+ FcheckResu = a.FcheckResu,
+ FcheckItemDesc=a.FcheckItemDesc
}).ToList();
}
--
Gitblit v1.9.3