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/SJService.cs | 199 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 139 insertions(+), 60 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index aa32e8c..fc8c81e 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -44,69 +44,145 @@
if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
- var query = db.Queryable<SJPageResult>()
- .WhereIF(lineNo != null && lineNo.Length > 0,
- a => lineNo.Contains(a.line))
- .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
- .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
- a => a.BillNo == queryObj.BillNo)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- "鏈畬鎴�".Equals(queryObj.Result),
- a => a.Fsubmit == 0)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- !"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Fsubmit == 1);
-
- // 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
- if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+ // 濡傛灉鏈夎溅闂存垨绾夸綋绛涢�夛紝闇�瑕佽仈鎺� MES_LINE 琛�
+ if (!string.IsNullOrEmpty(queryObj.departmentId) || !string.IsNullOrEmpty(queryObj.lineId))
{
- switch (queryObj.searchField)
+ var query = db.Queryable<SJPageResult, MesLine>((a, m) =>
+ new JoinQueryInfos(JoinType.Left, a.line == m.LineNo))
+ .WhereIF(lineNo != null && lineNo.Length > 0,
+ (a, m) => lineNo.Contains(a.line))
+ .WhereIF(queryObj.Id != null, (a, m) => a.Id == queryObj.Id)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+ (a, m) => a.BillNo == queryObj.BillNo)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ "鏈畬鎴�".Equals(queryObj.Result),
+ (a, m) => a.Fsubmit == 0)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ !"鏈畬鎴�".Equals(queryObj.Result),
+ (a, m) => a.Fsubmit == 1)
+ // 娣诲姞杞﹂棿绛涢��
+ .WhereIF(!string.IsNullOrEmpty(queryObj.departmentId),
+ (a, m) => m.DepotId.ToString() == queryObj.departmentId)
+ // 娣诲姞绾夸綋绛涢��
+ .WhereIF(!string.IsNullOrEmpty(queryObj.lineId),
+ (a, m) => m.LineNo == queryObj.lineId);
+
+ // 娣诲姞鎼滅储鏉′欢
+ if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
{
- case "daa001": // 宸ュ崟
- query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
- break;
- case "billNo": // 妫�楠屽崟鍙�
- query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
- break;
- case "line": // 浜х嚎
- query = query.Where(x => x.line.Contains(queryObj.SearchValue));
- break;
- case "itemNo": // 鐗╂枡缂栫爜
- query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
- break;
- case "daa003": // 鐗╂枡鍚嶇О
- query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
- break;
- default:
- // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯＄硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
- query = query.Where(x =>
- x.ItemNo.Contains(queryObj.SearchValue) ||
- x.Daa003.Contains(queryObj.SearchValue) ||
- x.daa001.Contains(queryObj.SearchValue) ||
- x.BillNo.Contains(queryObj.SearchValue) ||
- x.line.Contains(queryObj.SearchValue));
- break;
+ switch (queryObj.searchField)
+ {
+ case "daa001": // 宸ュ崟
+ query = query.Where((a, m) => a.daa001.Contains(queryObj.SearchValue));
+ break;
+ case "billNo": // 妫�楠屽崟鍙�
+ query = query.Where((a, m) => a.BillNo.Contains(queryObj.SearchValue));
+ break;
+ case "line": // 浜х嚎
+ query = query.Where((a, m) => a.line.Contains(queryObj.SearchValue));
+ break;
+ case "itemNo": // 鐗╂枡缂栫爜
+ query = query.Where((a, m) => a.ItemNo.Contains(queryObj.SearchValue));
+ break;
+ case "daa003": // 鐗╂枡鍚嶇О
+ query = query.Where((a, m) => a.Daa003.Contains(queryObj.SearchValue));
+ break;
+ default:
+ query = query.Where((a, m) =>
+ a.ItemNo.Contains(queryObj.SearchValue) ||
+ a.Daa003.Contains(queryObj.SearchValue) ||
+ a.daa001.Contains(queryObj.SearchValue) ||
+ a.BillNo.Contains(queryObj.SearchValue) ||
+ a.line.Contains(queryObj.SearchValue));
+ break;
+ }
}
+ else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+ {
+ query = query.Where((a, m) =>
+ a.ItemNo.Contains(queryObj.SearchValue) ||
+ a.Daa003.Contains(queryObj.SearchValue) ||
+ a.daa001.Contains(queryObj.SearchValue) ||
+ a.BillNo.Contains(queryObj.SearchValue) ||
+ a.line.Contains(queryObj.SearchValue));
+ }
+
+ var totalCount = 0;
+ var data = query.OrderBy((a, m) => a.BillNo, OrderByType.Desc)
+ .Select((a, m) => a)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (data, totalCount);
}
- // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
- else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+ else
{
- // 淇濇寔鍘熸湁鐨勫瀛楁妯＄硦鏌ヨ閫昏緫
- query = query.Where(x =>
- x.ItemNo.Contains(queryObj.SearchValue) ||
- x.Daa003.Contains(queryObj.SearchValue) ||
- x.daa001.Contains(queryObj.SearchValue) ||
- x.BillNo.Contains(queryObj.SearchValue) ||
- x.line.Contains(queryObj.SearchValue));
+ // 娌℃湁杞﹂棿鍜岀嚎浣撶瓫閫夋椂锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+ var query = db.Queryable<SJPageResult>()
+ .WhereIF(lineNo != null && lineNo.Length > 0,
+ a => lineNo.Contains(a.line))
+ .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
+ a => a.BillNo == queryObj.BillNo)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ "鏈畬鎴�".Equals(queryObj.Result),
+ a => a.Fsubmit == 0)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ !"鏈畬鎴�".Equals(queryObj.Result),
+ a => a.Fsubmit == 1);
+
+ // 鏂板鐨勫姩鎬佹悳绱㈤�昏緫
+ if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
+ {
+ switch (queryObj.searchField)
+ {
+ case "daa001": // 宸ュ崟
+ query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
+ break;
+ case "billNo": // 妫�楠屽崟鍙�
+ query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
+ break;
+ case "line": // 浜х嚎
+ query = query.Where(x => x.line.Contains(queryObj.SearchValue));
+ break;
+ case "itemNo": // 鐗╂枡缂栫爜
+ query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
+ break;
+ case "daa003": // 鐗╂枡鍚嶇О
+ query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
+ break;
+ default:
+ // 濡傛灉娌℃湁鎸囧畾瀛楁鎴栧瓧娈典笉鍖归厤锛屼娇鐢ㄥ師鏈夌殑妯＄硦鏌ヨ閫昏緫浣滀负鍏滃簳鏂规
+ query = query.Where(x =>
+ x.ItemNo.Contains(queryObj.SearchValue) ||
+ x.Daa003.Contains(queryObj.SearchValue) ||
+ x.daa001.Contains(queryObj.SearchValue) ||
+ x.BillNo.Contains(queryObj.SearchValue) ||
+ x.line.Contains(queryObj.SearchValue));
+ break;
+ }
+ }
+ // 涓轰簡鍏煎鏃х増鏈紝濡傛灉娌℃湁浼犻�� searchField锛屼娇鐢ㄥ師鏉ョ殑鏌ヨ閫昏緫
+ else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
+ {
+ // 淇濇寔鍘熸湁鐨勫瀛楁妯＄硦鏌ヨ閫昏緫
+ query = query.Where(x =>
+ x.ItemNo.Contains(queryObj.SearchValue) ||
+ x.Daa003.Contains(queryObj.SearchValue) ||
+ x.daa001.Contains(queryObj.SearchValue) ||
+ x.BillNo.Contains(queryObj.SearchValue) ||
+ x.line.Contains(queryObj.SearchValue));
+ }
+
+ var totalCount = 0;
+ var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ return (data, totalCount);
}
-
- var totalCount = 0;
- var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
-
- return (data, totalCount);
}
@@ -208,7 +284,8 @@
Mnum = b.Mnum, // 浠庝富琛ㄨ幏鍙朚NUM
Dnum = b.Dnum, // 浠庡瓙琛ㄨ幏鍙朌NUM
Snum = a.Snum, // 閫佹鎵规暟
- Remarks = a.Remarks
+ Remarks = a.Remarks,
+ Forder = a.Forder // 椤哄簭瀛楁
}).ToList();
var array = qsItemIpiItems.Select(s => s.Id).ToArray();
@@ -300,8 +377,10 @@
qsItemIpiItem.imageData = Convert.ToBase64String(s.Picture);
});
- //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
- qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
+ //鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
+ qsItemIpiItems = qsItemIpiItems
+ .OrderBy(s => s.Forder ?? 0)
+ .ToList();
// 涓烘瘡涓楠岄」鐩敓鎴愮┐鍙蜂俊鎭�
qsItemIpiItems.ForEach(item =>
--
Gitblit v1.9.3