From dabfdd9dbf0364b1134daaad86af7e13f6437295 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期四, 30 十月 2025 12:40:30 +0800
Subject: [PATCH] XJ,SJ,RKJ检验项目序号，LLJ单个检验项目FTP附件信息
---
StandardInterface/MES.Service/service/QC/RKJService.cs | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 83a7b51..e3c8ff7 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -291,7 +291,8 @@
a.FcheckLevel,
a.FacLevel,
a.QsCode,
- a.QsName
+ a.QsName,
+ a.Forder
}).Select((a, b) => new QsItemOqcItem
{
ProjName = a.ProjName,
@@ -308,10 +309,11 @@
FacLevel = a.FacLevel,
QsCode = a.QsCode,
QsName = a.QsName,
+ Forder = a.Forder,
isCheck = SqlFunc.AggregateCount(b.Id),
Result = SqlFunc.AggregateCount(b.Id) == 0 ? "鏈畬鎴�" :
a.IsPass == 1 ? "鍚堟牸" : "涓嶅悎鏍�"
- }).OrderBy("result desc").ToList();
+ }).OrderBy("FORDER").ToList();
}
public dynamic save(RKJDto rkjDto)
@@ -610,49 +612,55 @@
return db
- .Queryable<QsItemOqcReq, Womdaa, MesItems>((a, da, b) =>
+ .Queryable<QsItemOqcReq, Womdaa, MesItems, MesLine>((a, da, b, m) =>
new JoinQueryInfos(
JoinType.Left, da.Daa001 == a.BillNo,
- JoinType.Left, a.ItemId == b.Id
+ JoinType.Left, a.ItemId == b.Id,
+ JoinType.Left, da.Daa015 == m.LineNo
))
.WhereIF(lineNo != null && lineNo.Length > 0,
- (a, da, b) => lineNo.Contains(da.Daa015))
+ (a, da, b, m) => lineNo.Contains(da.Daa015))
+ // 娣诲姞QC绛涢�夋潯浠讹細杞﹂棿鍜岀嚎浣�
+ .WhereIF(!string.IsNullOrEmpty(queryObj.departmentId),
+ (a, da, b, m) => m.DepotId.ToString() == queryObj.departmentId)
+ .WhereIF(!string.IsNullOrEmpty(queryObj.lineId),
+ (a, da, b, m) => m.LineNo == queryObj.lineId)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, da, b) => a.FcheckResu == null || a.FcheckResu == "")
+ (a, da, b, m) => a.FcheckResu == null || a.FcheckResu == "")
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, da, b) => a.FcheckResu != null && a.FcheckResu != "")
- .WhereIF(id > 0, (a, da, b) => a.Id == id)
+ (a, da, b, m) => a.FcheckResu != null && a.FcheckResu != "")
+ .WhereIF(id > 0, (a, da, b, m) => a.Id == id)
// 娣诲姞fsubmit瀛楁杩囨护閫昏緫 - 鍙湁鍦ㄦ槑纭寚瀹歠submit鍙傛暟鏃舵墠杩囨护锛屼笖娌℃湁浼犻�抜d鏃舵墠杩囨护
.WhereIF(
id <= 0 && StringUtil.IsNotNullOrEmpty(queryObj.fsubmit) && queryObj.fsubmit == "1",
- (a, da, b) => a.Fsubmit == 1)
+ (a, da, b, m) => a.Fsubmit == 1)
.WhereIF(
id <= 0 && StringUtil.IsNotNullOrEmpty(queryObj.fsubmit) && queryObj.fsubmit == "0",
- (a, da, b) => a.Fsubmit == 0 || a.Fsubmit == null)
+ (a, da, b, m) => a.Fsubmit == 0 || a.Fsubmit == null)
// 娣诲姞鎼滅储鏉′欢 - 鏍规嵁閫夋嫨鐨勬悳绱㈠瓧娈佃繘琛岀簿纭悳绱�
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "billNo", // 宸ュ崟
- (a, da, b) => a.BillNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.BillNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "releaseNo", // 妫�楠屽崟鍙�
- (a, da, b) => a.ReleaseNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.ReleaseNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "daa015", // 浜х嚎
- (a, da, b) => da.Daa015.Contains(queryObj.SearchValue))
+ (a, da, b, m) => da.Daa015.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemNo", // 鐗╂枡缂栫爜
- (a, da, b) => a.ItemNo.Contains(queryObj.SearchValue))
+ (a, da, b, m) => a.ItemNo.Contains(queryObj.SearchValue))
.WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemName", // 鐗╂枡鍚嶇О
- (a, da, b) => b.ItemName.Contains(queryObj.SearchValue))
+ (a, da, b, m) => b.ItemName.Contains(queryObj.SearchValue))
// 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
.WhereIF(string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue),
- (a, da, b) =>
+ (a, da, b, m) =>
a.ItemNo.Contains(queryObj.SearchValue) ||
b.ItemName.Contains(queryObj.SearchValue) ||
a.BillNo.Contains(queryObj.SearchValue) ||
a.ReleaseNo.Contains(queryObj.SearchValue) ||
da.Daa015.Contains(queryObj.SearchValue))
- .Select((a, da, b) => new QsItemOqcReq
+ .Select((a, da, b, m) => new QsItemOqcReq
{
Id = a.Id,
ReleaseNo = a.ReleaseNo,
--
Gitblit v1.9.3