From 26b62961ce34bd91ba72560017d166502154aae8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 01 三月 2025 09:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
StandardPda/MES.Service/service/QC/LljService.cs | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index d625b60..4137734 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;
@@ -25,32 +26,47 @@
var totalCount = 0;
- var itemIds = GetQaItem(db, queryObj.createUser);
+ //var itemIds = GetQaItem(db, queryObj.createUser);
- var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01>((a, b, c,d) =>
+ var pageList = db.Queryable<LtsLlj, IqcBefore, VMesQaItemsDetect01, SysUser, IqcBeforeFrom, SysUser>((a, b,d,e,f,g) =>
new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
- JoinType.Left, b.Sid == c.Fid,JoinType.Inner, a.Id == d.Id
+
+ JoinType.Inner, a.Id == d.Id,
+ JoinType.Left, a.CreateBy == e.Fcode,
+ JoinType.Left,f.Id==b.PID,
+ JoinType.Left, f.Sid == g.Fid
))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c) => a.FcheckResu == null )
+ (a, b, d) => a.FcheckResu == null )
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c) => a.FcheckResu != null)
- .WhereIF(
- itemIds is { Length: > 0 },
- (a, b, c) => itemIds.Contains(a.ItemId))
- .WhereIF(id > 0, (a, b, c) => a.Id == id)
- .OrderByDescending((a, b, c) => a.Id)
- .Select((a, b, c, d) => new LtsLlj
+ (a, b, d) => a.FcheckResu != null)
+ //.WhereIF(
+ // itemIds is { Length: > 0 },
+ // (a, b, c) => itemIds.Contains(a.ItemId))
+ .WhereIF(id > 0, (a, b, d) => a.Id == id )
+ .WhereIF(true, (a, b,d, e,f,g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
+ //鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
+ //.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, d) => a.Id)
+ .Select((a, b, d,e,f,g) => new LtsLlj
{
- UserName = c.Fname,
- FIRST=d.First
+ UserName = g.Fname,
+ FIRST=d.First,
+ CreateUserName=e.Fname,
+ NewFngDesc=d.NewFngDesc
+
}, true)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
return (pageList, totalCount);
}
@@ -261,7 +277,8 @@
a.FspecRequ,
a.FreQty,
a.CheckQyt,
- a.FcheckResu
+ a.FcheckResu,
+ a.FcheckItemDesc
}).Select((a, b) => new MesQaItemsDetectDetail5
{
Id = a.Id,
@@ -280,7 +297,8 @@
Factory = "1000",
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
- FcheckResu = a.FcheckResu
+ FcheckResu = a.FcheckResu,
+ FcheckItemDesc=a.FcheckItemDesc
}).ToList();
}
@@ -540,8 +558,8 @@
return SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<MesQaItemsDetect01>()
- // .SetColumns(it =>
- // it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
+ .SetColumns(it =>
+ it.FngDesc == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
.Where(it => it.ReleaseNo == dto.releaseNo)
.ExecuteCommand();
});
--
Gitblit v1.9.3