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/XJService.cs | 190 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 145 insertions(+), 45 deletions(-)
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index 210860e..9de79c9 100644
--- a/StandardInterface/MES.Service/service/QC/XJService.cs
+++ b/StandardInterface/MES.Service/service/QC/XJService.cs
@@ -337,6 +337,48 @@
s.imageData = Convert.ToBase64String(s.Picture);
});
+ // 浠� QS_ITEM_IPI_IMAGE 琛ㄤ腑鑾峰彇鍥剧墖鏁版嵁锛堟敮鎸佸鍥剧墖锛屽贰妫� QS_TYPE=2锛�
+ var itemIds = qsQaItemXj01s.Select(s => s.Id).ToArray();
+ var imageList = db.Queryable<QsItemIpiImage>()
+ .Where(s => itemIds.Contains(s.Fid) && s.QsType == 2 && s.ImageData != null)
+ .ToList();
+
+ if (imageList.Count > 0)
+ {
+ // 鎸夋楠岄」鐩甀D鍒嗙粍
+ var imageGroups = imageList.GroupBy(img => img.Fid);
+ foreach (var group in imageGroups)
+ {
+ var xjItem = qsQaItemXj01s.Find(t => t.Id == group.Key);
+ if (xjItem != null)
+ {
+ // 鍒濆鍖栧浘鐗囧垪琛�
+ xjItem.imageList = new List<ImageInfo>();
+
+ foreach (var img in group)
+ {
+ if (img.ImageData != null && img.ImageData.Length > 0)
+ {
+ xjItem.imageList.Add(new ImageInfo
+ {
+ Id = img.Id ?? 0,
+ FileName = img.Picturename,
+ Base64Data = Convert.ToBase64String(img.ImageData),
+ CreateDate = img.CreateDate,
+ CreateBy = img.CreateBy
+ });
+ }
+ }
+
+ // 淇濇寔鍚戝悗鍏煎锛氬鏋滄湁鍥剧墖锛岃缃涓�寮犲浘鐗囦负 imageData
+ if (xjItem.imageList.Count > 0)
+ {
+ xjItem.imageData = xjItem.imageList[0].Base64Data;
+ }
+ }
+ }
+ }
+
//鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
qsQaItemXj01s = qsQaItemXj01s
.OrderBy(s => s.Forder ?? 0)
@@ -474,6 +516,35 @@
if (qsQaItemXj01.Picture is { Length: > 0 })
qsQaItemXj01.imageData =
Convert.ToBase64String(qsQaItemXj01.Picture);
+
+ // 浠� QS_ITEM_IPI_IMAGE 琛ㄤ腑鑾峰彇鍥剧墖鍒楄〃锛堝贰妫� QS_TYPE=2锛�
+ var imageRecords = db.Queryable<QsItemIpiImage>()
+ .Where(s => s.Fid == id && s.QsType == 2 && s.ImageData != null)
+ .ToList();
+
+ if (imageRecords.Count > 0)
+ {
+ qsQaItemXj01.imageList = new List<ImageInfo>();
+ foreach (var img in imageRecords)
+ {
+ if (img.ImageData != null && img.ImageData.Length > 0)
+ {
+ qsQaItemXj01.imageList.Add(new ImageInfo
+ {
+ Id = img.Id ?? 0,
+ FileName = img.Picturename,
+ Base64Data = Convert.ToBase64String(img.ImageData),
+ CreateDate = img.CreateDate,
+ CreateBy = img.CreateBy
+ });
+ }
+ }
+ // 淇濇寔鍚戝悗鍏煎
+ if (qsQaItemXj01.imageList.Count > 0)
+ {
+ qsQaItemXj01.imageData = qsQaItemXj01.imageList[0].Base64Data;
+ }
+ }
xjDto.ItemXj01 = qsQaItemXj01;
@@ -694,24 +765,39 @@
{
try
{
- var db = SqlSugarHelper.GetInstance();
-
- // 鐩存帴鏇存柊Fsubmit瀛楁涓�1锛堝凡鎻愪氦鐘舵�侊級
- var result = db.Updateable<QsQaItemXj>()
- .SetColumns(s => s.Fsubmit == 1)
- .SetColumns(s => s.FsubmitBy == dto.userNo)
- .SetColumns(s => s.FsubmitDate == DateTime.Now)
- .Where(s => s.Id == dto.id)
- .ExecuteCommand();
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("c_res", null,
+ System.Data.DbType.Int32, ParameterDirection.Output,
+ 4000);
- if (result > 0)
+ var outputMessage = new SugarParameter("c_msg", null,
+ System.Data.DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟锛屽浐瀹欶LAG涓�1锛堝鏍革級
+ var parameters = new List<SugarParameter>
{
- return true;
- }
- else
- {
- throw new Exception("鎻愪氦澶辫触锛氭湭鎵惧埌瀵瑰簲鐨勬楠屽崟");
- }
+ new("P_ID", dto.id, System.Data.DbType.Decimal, ParameterDirection.Input),
+ new("P_FLAG", 1, System.Data.DbType.Int32, ParameterDirection.Input),
+ new("P_USER", dto.userNo, System.Data.DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_WOMDAA_XJ_UPDATE_RES(:P_ID, :P_FLAG, :P_USER, :c_res, :c_msg); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+
+ return true;
}
catch (Exception ex)
{
@@ -1018,9 +1104,9 @@
}
/// <summary>
- /// 涓婁紶鍥剧墖鍒版楠岄」鐩殑PICTURE瀛楁
+ /// 涓婁紶鍥剧墖鍒� QS_ITEM_IPI_IMAGE 琛紙宸℃ QS_TYPE=2锛�
/// </summary>
- /// <param name="id">妫�楠岄」鐩甀D</param>
+ /// <param name="id">妫�楠岄」鐩甀D (FID)</param>
/// <param name="imageBytes">鍥剧墖瀛楄妭鏁扮粍</param>
/// <param name="fileName">鍘熷鏂囦欢鍚�</param>
/// <param name="createBy">鍒涘缓浜�</param>
@@ -1053,30 +1139,34 @@
return (1, "鍥剧墖澶у皬涓嶈兘瓒呰繃5MB");
}
- // 鐢熸垚鏃堕棿鎴虫枃浠跺悕锛屾牸寮忥細1746945271304.jpg
- var timestamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
- var timestampFileName = $"{timestamp}{extension}";
-
var result = SqlSugarHelper.UseTransactionWithOracle(db =>
{
- // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦�
- var exists = db.Queryable<QsQaItemXj01>()
+ // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦紝骞惰幏鍙栨楠屽崟ID (GID) 鍜� 妫�楠岄」鐩悕绉�
+ var xjItem = db.Queryable<QsQaItemXj01>()
.Where(s => s.Id == id)
- .Any();
+ .Select(s => new { s.Id, s.Pid, s.ProjName })
+ .First();
- if (!exists)
+ if (xjItem == null)
{
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 鏇存柊PICTURE瀛楁锛圠ONG RAW绫诲瀷锛夊拰PICTURENAME瀛楁锛堟椂闂存埑鏂囦欢鍚嶏級
- var updateResult = db.Updateable<QsQaItemXj01>()
- .SetColumns(s => s.Picture == imageBytes)
- .SetColumns(s => s.Picturename == timestampFileName)
- .Where(s => s.Id == id)
- .ExecuteCommand();
+ // 姣忔閮藉垱寤烘柊鐨勫浘鐗囪褰曪紝鏀寔澶氬浘鐗囦笂浼�
+ var newImage = new QsItemIpiImage
+ {
+ Fid = id, // 妫�楠岄」鐩甀D
+ Gid = xjItem.Pid, // 妫�楠屽崟ID
+ QsType = 2, // 宸℃绫诲瀷
+ ImageData = imageBytes, // 鍥剧墖浜岃繘鍒舵暟鎹�
+ Picturename = fileName, // 淇濈暀鍘熷鏂囦欢鍚�
+ JyName = xjItem.ProjName, // 妫�楠岄」鐩悕绉�
+ CreateDate = DateTime.Now, // 鍒涘缓鏃堕棿
+ CreateBy = createBy // 鍒涘缓浜�
+ };
- return updateResult;
+ var insertResult = db.Insertable(newImage).ExecuteCommand();
+ return insertResult;
});
if (result > 0)
@@ -1085,7 +1175,7 @@
}
else
{
- return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖淇濆瓨澶辫触");
}
}
catch (Exception ex)
@@ -1095,11 +1185,12 @@
}
/// <summary>
- /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
+ /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖锛堜粠 QS_ITEM_IPI_IMAGE 琛ㄤ腑鍒犻櫎锛屽贰妫� QS_TYPE=2锛�
/// </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
{
@@ -1115,14 +1206,23 @@
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 娓呯┖PICTURE瀛楁鍜孭ICTURENAME瀛楁
- var updateResult = db.Updateable<QsQaItemXj01>()
- .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 == 2)
+ .ExecuteCommand();
+ }
+ else
+ {
+ // 鍒犻櫎璇ユ楠岄」鐩殑鎵�鏈夊浘鐗�
+ deleteResult = db.Deleteable<QsItemIpiImage>()
+ .Where(s => s.Fid == id && s.QsType == 2)
+ .ExecuteCommand();
+ }
- return updateResult;
+ return deleteResult;
});
if (result > 0)
@@ -1131,7 +1231,7 @@
}
else
{
- return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫浘鐗囪褰�");
}
}
catch (Exception ex)
--
Gitblit v1.9.3