From e853dd2fecef3a0c446d161248d0498a5a081e66 Mon Sep 17 00:00:00 2001
From: xwt <2740516069@qq.com>
Date: 星期三, 17 十二月 2025 18:49:49 +0800
Subject: [PATCH] SJ,XJ,RKJ优化修改
---
StandardInterface/MES.Service/service/QC/SJService.cs | 325 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 224 insertions(+), 101 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index db8e86a..1703d1a 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();
@@ -288,20 +365,52 @@
}
});
- //浣跨敤linq琛ㄨ揪寮忚繃婊ゅ嚭鍥剧墖id涓嶄负绌虹殑鏁版嵁
- var itemIpiItems =
- qsItemIpiItems.Where(s => s.Picture is { Length: > 0 })
- .ToList();
- if (itemIpiItems.Count > 0)
- itemIpiItems.ForEach(s =>
+ // 浠� QS_ITEM_IPI_IMAGE 琛ㄤ腑鑾峰彇鍥剧墖鏁版嵁锛堟敮鎸佸鍥剧墖锛�
+ var itemIds = qsItemIpiItems.Select(s => s.Id).ToArray();
+ var imageList = db.Queryable<QsItemIpiImage>()
+ .Where(s => itemIds.Contains(s.Fid) && s.QsType == 1 && s.ImageData != null)
+ .ToList();
+
+ if (imageList.Count > 0)
+ {
+ // 鎸夋楠岄」鐩甀D鍒嗙粍
+ var imageGroups = imageList.GroupBy(img => img.Fid);
+ foreach (var group in imageGroups)
{
- var qsItemIpiItem = qsItemIpiItems.Find(t => t.Id == s.Id);
- //灏嗗瓧鑺傛暟缁勮浆鎹负Base64缂栫爜鐨勫瓧绗︿覆
- qsItemIpiItem.imageData = Convert.ToBase64String(s.Picture);
- });
+ var qsItemIpiItem = qsItemIpiItems.Find(t => t.Id == group.Key);
+ if (qsItemIpiItem != null)
+ {
+ // 鍒濆鍖栧浘鐗囧垪琛�
+ qsItemIpiItem.imageList = new List<ImageInfo>();
+
+ foreach (var img in group)
+ {
+ if (img.ImageData != null && img.ImageData.Length > 0)
+ {
+ qsItemIpiItem.imageList.Add(new ImageInfo
+ {
+ Id = img.Id ?? 0,
+ FileName = img.Picturename,
+ Base64Data = Convert.ToBase64String(img.ImageData),
+ CreateDate = img.CreateDate,
+ CreateBy = img.CreateBy
+ });
+ }
+ }
+
+ // 淇濇寔鍚戝悗鍏煎锛氬鏋滄湁鍥剧墖锛岃缃涓�寮犲浘鐗囦负 imageData
+ if (qsItemIpiItem.imageList.Count > 0)
+ {
+ qsItemIpiItem.imageData = qsItemIpiItem.imageList[0].Base64Data;
+ }
+ }
+ }
+ }
- //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
- qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
+ //鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
+ qsItemIpiItems = qsItemIpiItems
+ .OrderBy(s => s.Forder ?? 0)
+ .ToList();
// 涓烘瘡涓楠岄」鐩敓鎴愮┐鍙蜂俊鎭�
qsItemIpiItems.ForEach(item =>
@@ -676,8 +785,8 @@
new("P_ID", id, System.Data.DbType.Decimal, ParameterDirection.Input),
new("P_NO", no, System.Data.DbType.String, ParameterDirection.Input),
new("P_USER", user, System.Data.DbType.String, ParameterDirection.Input),
- new("P_MNUM", mnum ?? 1, System.Data.DbType.Decimal, ParameterDirection.Input),
- new("P_DNUM", dnum ?? "", System.Data.DbType.String, ParameterDirection.Input),
+ new("P_MNUM", mnum, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_DNUM", dnum, System.Data.DbType.String, ParameterDirection.Input),
outputResult,
outputMessage
};
@@ -1030,9 +1139,9 @@
}
/// <summary>
- /// 涓婁紶鍥剧墖鍒版楠岄」鐩殑PICTURE瀛楁
+ /// 涓婁紶鍥剧墖鍒� QS_ITEM_IPI_IMAGE 琛�
/// </summary>
- /// <param name="id">妫�楠岄」鐩甀D</param>
+ /// <param name="id">妫�楠岄」鐩甀D (FID)</param>
/// <param name="imageBytes">鍥剧墖瀛楄妭鏁扮粍</param>
/// <param name="fileName">鍘熷鏂囦欢鍚�</param>
/// <param name="createBy">鍒涘缓浜�</param>
@@ -1065,30 +1174,34 @@
return (1, "鍥剧墖澶у皬涓嶈兘瓒呰繃5MB");
}
- // 鐢熸垚鏃堕棿鎴虫枃浠跺悕锛屾牸寮忥細1746945271304.jpg
- var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
- var timestampFileName = $"{timestamp}{extension}";
-
var result = SqlSugarHelper.UseTransactionWithOracle(db =>
{
- // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦�
- var exists = db.Queryable<QsItemIpiItem>()
+ // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦紝骞惰幏鍙栨楠屽崟ID (GID) 鍜� 妫�楠岄」鐩悕绉� (PROJ_NAME)
+ var ipiItem = db.Queryable<QsItemIpiItem>()
.Where(s => s.Id == id)
- .Any();
+ .Select(s => new { s.Id, s.Pid, s.ProjName })
+ .First();
- if (!exists)
+ if (ipiItem == null)
{
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 鏇存柊PICTURE瀛楁锛圠ONG RAW绫诲瀷锛夊拰PICTURENAME瀛楁锛堟椂闂存埑鏂囦欢鍚嶏級
- var updateResult = db.Updateable<QsItemIpiItem>()
- .SetColumns(s => s.Picture == imageBytes)
- .SetColumns(s => s.Picturename == timestampFileName)
- .Where(s => s.Id == id)
- .ExecuteCommand();
+ // 姣忔閮藉垱寤烘柊鐨勫浘鐗囪褰曪紝鏀寔澶氬浘鐗囦笂浼�
+ var newImage = new QsItemIpiImage
+ {
+ Fid = id, // 妫�楠岄」鐩甀D
+ Gid = ipiItem.Pid, // 妫�楠屽崟ID锛堜粠妫�楠岄」鐩殑Pid鑾峰彇锛�
+ QsType = 1, // 棣栨绫诲瀷
+ ImageData = imageBytes, // 鍥剧墖浜岃繘鍒舵暟鎹�
+ Picturename = fileName, // 淇濈暀鍘熷鏂囦欢鍚�
+ JyName = ipiItem.ProjName, // 妫�楠岄」鐩悕绉�
+ CreateDate = DateTime.Now, // 鍒涘缓鏃堕棿
+ CreateBy = createBy // 鍒涘缓浜�
+ };
- return updateResult;
+ var insertResult = db.Insertable(newImage).ExecuteCommand();
+ return insertResult;
});
if (result > 0)
@@ -1097,7 +1210,7 @@
}
else
{
- return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖淇濆瓨澶辫触");
}
}
catch (Exception ex)
@@ -1107,11 +1220,12 @@
}
/// <summary>
- /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
+ /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖锛堜粠 QS_ITEM_IPI_IMAGE 琛ㄤ腑鍒犻櫎锛�
/// </summary>
- /// <param name="id">妫�楠岄」鐩甀D</param>
+ /// <param name="id">妫�楠岄」鐩甀D (FID)锛屽綋imageId涓虹┖鏃跺垹闄よ妫�楠岄」鐩殑鎵�鏈夊浘鐗�</param>
+ /// <param name="imageId">鍥剧墖ID锛岀敤浜庡垹闄ゅ崟寮犲浘鐗囷紙鍙�夛級</param>
/// <returns>鎿嶄綔缁撴灉</returns>
- public (int status, string message) DeleteImageFromPicture(decimal id)
+ public (int status, string message) DeleteImageFromPicture(decimal id, decimal? imageId = null)
{
try
{
@@ -1127,14 +1241,23 @@
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 娓呯┖PICTURE瀛楁鍜孭ICTURENAME瀛楁
- var updateResult = db.Updateable<QsItemIpiItem>()
- .SetColumns(s => s.Picture == null)
- .SetColumns(s => s.Picturename == null)
- .Where(s => s.Id == id)
- .ExecuteCommand();
+ int deleteResult;
+ if (imageId.HasValue)
+ {
+ // 鍒犻櫎鎸囧畾鐨勫崟寮犲浘鐗�
+ deleteResult = db.Deleteable<QsItemIpiImage>()
+ .Where(s => s.Id == imageId.Value && s.Fid == id && s.QsType == 1)
+ .ExecuteCommand();
+ }
+ else
+ {
+ // 鍒犻櫎璇ユ楠岄」鐩殑鎵�鏈夊浘鐗�
+ deleteResult = db.Deleteable<QsItemIpiImage>()
+ .Where(s => s.Fid == id && s.QsType == 1)
+ .ExecuteCommand();
+ }
- return updateResult;
+ return deleteResult;
});
if (result > 0)
@@ -1143,7 +1266,7 @@
}
else
{
- return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫浘鐗囪褰�");
}
}
catch (Exception ex)
--
Gitblit v1.9.3