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/Modes/QsItemOqcItem.cs | 5
StandardInterface/MESApplication/Controllers/QC/SJController.cs | 11
StandardInterface/MES.Service/service/QC/RKJService.cs | 147 ++++++++++---
StandardInterface/MES.Service/Modes/QsItemIpiImage.cs | 94 ++++++++
StandardInterface/MES.Service/Modes/QsQaItemXj01.cs | 5
StandardInterface/MES.Service/service/QC/SJService.cs | 122 +++++++---
StandardInterface/MES.Service/Modes/QsItemOqcReq.cs | 8
StandardInterface/MES.Service/service/QC/LljService.cs | 9
StandardInterface/MES.Service/service/QC/XJService.cs | 143 ++++++++++--
StandardInterface/MESApplication/Controllers/QC/XJController.cs | 9
StandardInterface/MESApplication/Controllers/QC/RKJController.cs | 18 +
StandardInterface/MES.Service/Dto/service/RKJDto.cs | 5
StandardInterface/MES.Service/Modes/QsItemIpiItem.cs | 36 +++
13 files changed, 498 insertions(+), 114 deletions(-)
diff --git a/StandardInterface/MES.Service/Dto/service/RKJDto.cs b/StandardInterface/MES.Service/Dto/service/RKJDto.cs
index 73bcbbd..0cd3757 100644
--- a/StandardInterface/MES.Service/Dto/service/RKJDto.cs
+++ b/StandardInterface/MES.Service/Dto/service/RKJDto.cs
@@ -20,9 +20,12 @@
// 閫佹鎵规
public string? RbillNo { get; set; }
- // 閫佹鏁伴噺
+ // 宸ュ崟鏁伴噺锛堝師閫佹鏁伴噺瀛楁锛�
public decimal? quantity { get; set; }
+ // 閫佹鏁伴噺锛堟柊澧炲瓧娈碉級
+ public decimal? sjqty { get; set; }
+
// 涓嶈壇鍘熷洜
public string? BLYY { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiImage.cs b/StandardInterface/MES.Service/Modes/QsItemIpiImage.cs
new file mode 100644
index 0000000..db4b84c
--- /dev/null
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiImage.cs
@@ -0,0 +1,94 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 棣栨鍥剧墖淇℃伅琛�
+/// </summary>
+[Table("QS_ITEM_IPI_IMAGE")]
+[SugarTable("QS_ITEM_IPI_IMAGE")]
+public class QsItemIpiImage
+{
+ /// <summary>
+ /// 涓婚敭 - 浣跨敤搴忓垪 SEQ_IPI_IMAGE
+ /// </summary>
+ [Key]
+ [Column("ID")]
+ [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_IPI_IMAGE",
+ ColumnName = "ID")]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 妫�楠岄」鐩甀D锛堝叧鑱� QS_ITEM_IPI_ITEM 琛級
+ /// </summary>
+ [Column("FID")]
+ [SugarColumn(ColumnName = "FID")]
+ public decimal? Fid { get; set; }
+
+ /// <summary>
+ /// 璐ㄦ绫诲瀷锛�1=棣栨锛�2=宸℃锛�3=鍏ュ簱妫�锛�4=鏉ユ枡妫�楠岋紝5=瓒呮湡妫�楠�
+ /// </summary>
+ [Column("QS_TYPE")]
+ [SugarColumn(ColumnName = "QS_TYPE")]
+ public decimal? QsType { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖浜岃繘鍒舵暟鎹紙LONG RAW绫诲瀷锛�
+ /// </summary>
+ [Column("IMAGE_DATA")]
+ [SugarColumn(ColumnName = "IMAGE_DATA")]
+ public byte[]? ImageData { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖鏂囦欢鍚�
+ /// </summary>
+ [Column("PICTURENAME")]
+ [SugarColumn(ColumnName = "PICTURENAME")]
+ [StringLength(200, ErrorMessage = "鍥剧墖鍚嶇О闀垮害涓嶈兘瓒呭嚭200")]
+ public string? Picturename { get; set; }
+
+ /// <summary>
+ /// 妫�楠屽崟ID锛堝叧鑱� QS_ITEM_IPI_REQ 琛級
+ /// </summary>
+ [Column("GID")]
+ [SugarColumn(ColumnName = "GID")]
+ public decimal? Gid { get; set; }
+
+ /// <summary>
+ /// 澶囩敤瀛楁 PID锛堝吋瀹规棫浠ｇ爜锛�
+ /// </summary>
+ [Column("PID")]
+ [SugarColumn(ColumnName = "PID")]
+ public decimal? Pid { get; set; }
+
+ /// <summary>
+ /// 妫�楠岄」鐩悕绉帮紙鏉ヨ嚜 QS_ITEM_IPI_ITEM.PROJ_NAME锛�
+ /// </summary>
+ [Column("JY_NAME")]
+ [SugarColumn(ColumnName = "JY_NAME")]
+ [StringLength(500, ErrorMessage = "妫�楠岄」鐩悕绉伴暱搴︿笉鑳借秴鍑�500")]
+ public string? JyName { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [Column("CREATE_DATE")]
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [Column("CREATE_BY")]
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ [StringLength(50, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�50")]
+ public string? CreateBy { get; set; }
+
+ /// <summary>
+ /// Base64缂栫爜鐨勫浘鐗囨暟鎹紙鐢ㄤ簬鍓嶇鏄剧ず锛屼笉瀛樺偍鍒版暟鎹簱锛�
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string? Base64Data { get; set; }
+}
diff --git a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
index 6fd72d9..cabf4c8 100644
--- a/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemIpiItem.cs
@@ -200,4 +200,40 @@
[SugarColumn(IsIgnore = true)] public string? result { get; set; }
[SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖鍒楄〃锛堢敤浜庡鍥剧墖灞曠ず锛�
+ /// </summary>
+ [SugarColumn(IsIgnore = true)] public List<ImageInfo>? imageList { get; set; }
+}
+
+/// <summary>
+/// 鍥剧墖淇℃伅绫伙紝鐢ㄤ簬澶氬浘鐗囧睍绀�
+/// </summary>
+public class ImageInfo
+{
+ /// <summary>
+ /// 鍥剧墖ID锛圦S_ITEM_IPI_IMAGE 琛ㄧ殑涓婚敭锛�
+ /// </summary>
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖鏂囦欢鍚�
+ /// </summary>
+ public string? FileName { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖Base64鏁版嵁
+ /// </summary>
+ public string? Base64Data { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string? CreateBy { get; set; }
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs b/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
index 2e8253d..f8754f6 100644
--- a/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemOqcItem.cs
@@ -177,6 +177,11 @@
[SugarColumn(IsIgnore = true)] public string? Result { get; set; }
[SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖鍒楄〃锛堢敤浜庡鍥剧墖灞曠ず锛�
+ /// </summary>
+ [SugarColumn(IsIgnore = true)] public List<ImageInfo>? imageList { get; set; }
[SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
diff --git a/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs b/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs
index 0d76abf..a3b1d36 100644
--- a/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs
+++ b/StandardInterface/MES.Service/Modes/QsItemOqcReq.cs
@@ -157,12 +157,18 @@
[SugarColumn(IsIgnore = true)] public string? Daa015 { get; set; }
/// <summary>
- /// 閫佹鏁伴噺
+ /// 宸ュ崟鏁伴噺锛堝師閫佹鏁伴噺瀛楁锛�
/// </summary>
[SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
/// <summary>
+ /// 閫佹鏁伴噺锛堟柊澧炲瓧娈碉級
+ /// </summary>
+ [SugarColumn(ColumnName = "SJQTY")]
+ public decimal? Sjqty { get; set; }
+
+ /// <summary>
/// 涓嶈壇鍘熷洜
/// </summary>
[SugarColumn(ColumnName = "BLYY")]
diff --git a/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs b/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
index 5a3f411..c857aab 100644
--- a/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
+++ b/StandardInterface/MES.Service/Modes/QsQaItemXj01.cs
@@ -162,6 +162,11 @@
[SugarColumn(IsIgnore = true)] public string? result { get; set; }
[SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖鍒楄〃锛堢敤浜庡鍥剧墖灞曠ず锛�
+ /// </summary>
+ [SugarColumn(IsIgnore = true)] public List<ImageInfo>? imageList { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜锛堜粠涓昏〃鑾峰彇锛�
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index eeb2956..9c204f1 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -1,4 +1,4 @@
-锘縰sing System.Data;
+锘匡豢using System.Data;
using System.Xml;
using System.Linq;
using Masuit.Tools;
@@ -582,6 +582,9 @@
// 鏍囧噯鍖朏TP鏈嶅姟鍣ㄥ湴鍧�
string normalizedServer = NormalizeFtpServer(ftpServer);
+ // 娓呯悊鏂囦欢鍚嶏細鍘婚櫎鎵�鏈夌┖鐧藉瓧绗︼紙鍖呮嫭涓嫳鏂囩┖鏍笺�佸埗琛ㄧ銆佸洖杞︽崲琛岀瓑锛�
+ fileName = System.Text.RegularExpressions.Regex.Replace(fileName, @"[\s\u3000\r\n]+", "");
+
// 鏋勫缓FTP鏂囦欢璺緞 - 鏉ユ枡妫�浣跨敤IQC鐩綍锛屼娇鐢╢version浣滀负瀛愮洰褰�
string ftpPath;
if (!string.IsNullOrEmpty(fversion))
@@ -674,8 +677,8 @@
normalizedServer += ":21"; // 榛樿FTP绔彛
}
- // 寮�鍙戠幆澧冧娇鐢ㄦ湰鍦版湇鍔″櫒
- normalizedServer = "ftp://192.168.1.22:21";
+ // 娉ㄩ噴鎺夊紑鍙戠幆澧冨己鍒惰鐩栵紝浣跨敤浼犲叆鐨勫疄闄匜TP鏈嶅姟鍣ㄥ湴鍧�
+ // normalizedServer = "ftp://192.168.1.22:21";
return normalizedServer;
}
diff --git a/StandardInterface/MES.Service/service/QC/RKJService.cs b/StandardInterface/MES.Service/service/QC/RKJService.cs
index 802b8e2..1639a80 100644
--- a/StandardInterface/MES.Service/service/QC/RKJService.cs
+++ b/StandardInterface/MES.Service/service/QC/RKJService.cs
@@ -366,10 +366,16 @@
if (!string.IsNullOrEmpty(rkjDto.RbillNo))
xj.RbillNo = rkjDto.RbillNo;
- // 纭繚Quantity瀛楁琚纭缃�
+ // 纭繚宸ュ崟鏁伴噺瀛楁琚纭缃紙QUANTITY锛�
if (xj.Quantity == null && rkjDto.quantity != null)
{
xj.Quantity = rkjDto.quantity;
+ }
+
+ // 纭繚閫佹鏁伴噺瀛楁琚纭缃紙SJQTY锛�
+ if (xj.Sjqty == null && rkjDto.sjqty != null)
+ {
+ xj.Sjqty = rkjDto.sjqty;
}
// 纭繚鎻愪氦鐘舵�佽姝ｇ‘璁剧疆锛堥粯璁や负鏈彁浜わ級
@@ -436,7 +442,7 @@
detail.Pid = s.Id;
detail.Gid = rkjDto.gid;
detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
+ detail.FcheckResu = "OK";
detail.UpdateBy = rkjDto.userNo;
detail.count = (int?)s.LevelNum;
SetQSItemDetail(detail);
@@ -599,7 +605,7 @@
}
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq>, int) getPage(XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -610,8 +616,9 @@
if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
lineNo = _baseService.getUserLineNo(queryObj.createUser);
+ var totalCount = 0;
- return db
+ var data = db
.Queryable<QsItemOqcReq, Womdaa, MesItems, MesLine>((a, da, b, m) =>
new JoinQueryInfos(
JoinType.Left, da.Daa001 == a.BillNo,
@@ -686,9 +693,38 @@
ItemName = b.ItemName,
ItemModel = b.ItemModel,
Daa015 = da.Daa015,
- Quantity = a.Quantity
+ Quantity = a.Quantity, // 宸ュ崟鏁伴噺
+ Sjqty = a.Sjqty // 閫佹鏁伴噺
}).OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+
+ // 淇妫�楠岀粨鏋滐細濡傛灉鏄剧ず涓衡�滃悎鏍尖�濅絾娌℃湁妫�楠岄」鐩紝鍒欐敼涓虹┖锛堝緟妫�楠岋級
+ if (data.Count > 0)
+ {
+ var ids = data.Select(d => d.Id).ToList();
+
+ // 鎵归噺鏌ヨ妫�楠岄」鐩暟閲�
+ var itemCounts = db.Queryable<QsItemOqcItem>()
+ .Where(item => ids.Contains(item.Pid.Value))
+ .GroupBy(item => item.Pid)
+ .Select(g => new { Pid = g.Pid, Count = SqlFunc.AggregateCount(g.Id) })
+ .ToList();
+
+ // 淇姣忔潯璁板綍鐨勬楠岀粨鏋�
+ foreach (var item in data)
+ {
+ var itemCount = itemCounts.FirstOrDefault(ic => ic.Pid == item.Id);
+ var hasItems = itemCount != null && itemCount.Count > 0;
+
+ // 濡傛灉娌℃湁妫�楠岄」鐩紝鍒欏皢妫�楠岀粨鏋滄竻绌猴紙鏄剧ず涓哄緟妫�楠岋級
+ if (!hasItems)
+ {
+ item.FcheckResu = null;
+ }
+ }
+ }
+
+ return (data, totalCount);
}
//鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
@@ -760,6 +796,35 @@
if (qsItemOqcItem.Picture is { Length: > 0 })
qsItemOqcItem.imageData =
Convert.ToBase64String(qsItemOqcItem.Picture);
+
+ // 浠� QS_ITEM_IPI_IMAGE 琛ㄤ腑鑾峰彇鍥剧墖鍒楄〃锛堝叆搴撴 QS_TYPE=3锛�
+ var imageRecords = db.Queryable<QsItemIpiImage>()
+ .Where(s => s.Fid == id && s.QsType == 3 && s.ImageData != null)
+ .ToList();
+
+ if (imageRecords.Count > 0)
+ {
+ qsItemOqcItem.imageList = new List<ImageInfo>();
+ foreach (var img in imageRecords)
+ {
+ if (img.ImageData != null && img.ImageData.Length > 0)
+ {
+ qsItemOqcItem.imageList.Add(new ImageInfo
+ {
+ Id = img.Id ?? 0,
+ FileName = img.Picturename,
+ Base64Data = Convert.ToBase64String(img.ImageData),
+ CreateDate = img.CreateDate,
+ CreateBy = img.CreateBy
+ });
+ }
+ }
+ // 淇濇寔鍚戝悗鍏煎
+ if (qsItemOqcItem.imageList.Count > 0 && string.IsNullOrEmpty(qsItemOqcItem.imageData))
+ {
+ qsItemOqcItem.imageData = qsItemOqcItem.imageList[0].Base64Data;
+ }
+ }
//鑾峰彇涓嶅悎鏍兼暟
var count = db.Queryable<QsItemOqcItemDetail>()
@@ -860,7 +925,7 @@
detail.Pid = s.Id;
detail.Gid = rkjDto.gid;
detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
+ detail.FcheckResu = "OK";
detail.UpdateBy = rkjDto.userNo;
detail.count = (int?)s.LevelNum;
SetQSItemDetail(detail);
@@ -1262,9 +1327,9 @@
}
/// <summary>
- /// 涓婁紶鍥剧墖鍒版楠岄」鐩殑PICTURE瀛楁
+ /// 涓婁紶鍥剧墖鍒� QS_ITEM_IPI_IMAGE 琛紙鍏ュ簱妫� QS_TYPE=3锛屾敮鎸佸鍥剧墖锛�
/// </summary>
- /// <param name="id">妫�楠岄」鐩甀D</param>
+ /// <param name="id">妫�楠岄」鐩甀D (FID)</param>
/// <param name="imageBytes">鍥剧墖瀛楄妭鏁扮粍</param>
/// <param name="fileName">鍘熷鏂囦欢鍚�</param>
/// <param name="createBy">鍒涘缓浜�</param>
@@ -1303,24 +1368,30 @@
var result = SqlSugarHelper.UseTransactionWithOracle(db =>
{
- // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦�
- var exists = db.Queryable<QsItemOqcItem>()
+ // 妫�鏌ユ楠岄」鐩槸鍚﹀瓨鍦紝骞惰幏鍙栨楠屽崟ID鍜屾楠岄」鐩悕绉�
+ var oqcItem = db.Queryable<QsItemOqcItem>()
.Where(s => s.Id == id)
- .Any();
+ .Select(s => new { s.Id, s.Pid, s.ProjName })
+ .First();
- if (!exists)
+ if (oqcItem == null)
{
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 鏇存柊PICTURE瀛楁锛圠ONG RAW绫诲瀷锛夊拰TPICTURENAME瀛楁锛堟椂闂存埑鏂囦欢鍚嶏級
- var updateResult = db.Updateable<QsItemOqcItem>()
- .SetColumns(s => s.Picture == imageBytes)
- .SetColumns(s => s.TPicturename == timestampFileName)
- .Where(s => s.Id == id)
- .ExecuteCommand();
-
- return updateResult;
+ // 姣忔閮藉垱寤烘柊鐨勫浘鐗囪褰曪紝鏀寔澶氬浘鐗囦笂浼�
+ var newImage = new QsItemIpiImage
+ {
+ Fid = id, // 妫�楠岄」鐩甀D (QS_ITEM_OQC_ITEM.ID)
+ Gid = oqcItem.Pid, // 妫�楠屽崟ID (QS_ITEM_OQC_REQ.ID)
+ QsType = 3, // 鍏ュ簱妫�绫诲瀷
+ ImageData = imageBytes,
+ Picturename = timestampFileName,
+ JyName = oqcItem.ProjName, // 妫�楠岄」鐩悕绉�
+ CreateDate = DateTime.Now,
+ CreateBy = createBy
+ };
+ return db.Insertable(newImage).ExecuteCommand();
});
if (result > 0)
@@ -1329,7 +1400,7 @@
}
else
{
- return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖淇濆瓨澶辫触");
}
}
catch (Exception ex)
@@ -1339,11 +1410,12 @@
}
/// <summary>
- /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
+ /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖锛堜粠 QS_ITEM_IPI_IMAGE 琛ㄤ腑鍒犻櫎锛屽叆搴撴 QS_TYPE=3锛�
/// </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
{
@@ -1359,14 +1431,23 @@
throw new Exception("妫�楠岄」鐩笉瀛樺湪");
}
- // 娓呯┖PICTURE瀛楁鍜孴PICTURENAME瀛楁
- var updateResult = db.Updateable<QsItemOqcItem>()
- .SetColumns(s => s.Picture == null)
- .SetColumns(s => s.TPicturename == null)
- .Where(s => s.Id == id)
- .ExecuteCommand();
+ int deleteResult;
+ if (imageId.HasValue && imageId.Value > 0)
+ {
+ // 鍒犻櫎鍗曞紶鍥剧墖
+ deleteResult = db.Deleteable<QsItemIpiImage>()
+ .Where(s => s.Id == imageId.Value && s.Fid == id && s.QsType == 3)
+ .ExecuteCommand();
+ }
+ else
+ {
+ // 鍒犻櫎璇ユ楠岄」鐩殑鎵�鏈夊浘鐗�
+ deleteResult = db.Deleteable<QsItemIpiImage>()
+ .Where(s => s.Fid == id && s.QsType == 3)
+ .ExecuteCommand();
+ }
- return updateResult;
+ return deleteResult;
});
if (result > 0)
@@ -1375,7 +1456,7 @@
}
else
{
- return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (0, "娌℃湁鎵惧埌瑕佸垹闄ょ殑鍥剧墖");
}
}
catch (Exception ex)
diff --git a/StandardInterface/MES.Service/service/QC/SJService.cs b/StandardInterface/MES.Service/service/QC/SJService.cs
index fc8c81e..1703d1a 100644
--- a/StandardInterface/MES.Service/service/QC/SJService.cs
+++ b/StandardInterface/MES.Service/service/QC/SJService.cs
@@ -365,17 +365,47 @@
}
});
- //浣跨敤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;
+ }
+ }
+ }
+ }
//鎺掑簭锛氬彧鎸塅ORDER椤哄簭鎺掑簭
qsItemIpiItems = qsItemIpiItems
@@ -1109,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>
@@ -1144,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)
@@ -1176,7 +1210,7 @@
}
else
{
- return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖淇濆瓨澶辫触");
}
}
catch (Exception ex)
@@ -1186,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
{
@@ -1206,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)
@@ -1222,7 +1266,7 @@
}
else
{
- return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫浘鐗囪褰�");
}
}
catch (Exception ex)
diff --git a/StandardInterface/MES.Service/service/QC/XJService.cs b/StandardInterface/MES.Service/service/QC/XJService.cs
index 05212da..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;
@@ -1033,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>
@@ -1068,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)
@@ -1100,7 +1175,7 @@
}
else
{
- return (1, "鍥剧墖淇濆瓨澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖淇濆瓨澶辫触");
}
}
catch (Exception ex)
@@ -1110,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
{
@@ -1130,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)
@@ -1146,7 +1231,7 @@
}
else
{
- return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勬楠岄」鐩�");
+ return (1, "鍥剧墖鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫浘鐗囪褰�");
}
}
catch (Exception ex)
diff --git a/StandardInterface/MESApplication/Controllers/QC/RKJController.cs b/StandardInterface/MESApplication/Controllers/QC/RKJController.cs
index 4e4cf90..a0859a0 100644
--- a/StandardInterface/MESApplication/Controllers/QC/RKJController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/RKJController.cs
@@ -144,14 +144,15 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getPage(queryObj);
+ var (tbBillList, totalCount) = new RKJService().getPage(queryObj);
resultInfos.tbBillList = tbBillList;
+ resultInfos.totalCount = totalCount;
return new ResponseResult
{
status = 0,
message = "OK",
- data = resultInfos
+ data = resultInfos,
+ TotalCount = totalCount
};
}
catch (Exception ex)
@@ -797,7 +798,7 @@
/// <summary>
/// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
/// </summary>
- /// <param name="data">鍖呭惈妫�楠岄」鐩甀D鐨凧SON瀵硅薄</param>
+ /// <param name="data">鍖呭惈妫�楠岄」鐩甀D鍜屽彲閫夌殑鍥剧墖ID鐨凧SON瀵硅薄</param>
/// <returns>鍒犻櫎缁撴灉</returns>
[HttpPost("DeleteImageFromPicture")]
public ResponseResult DeleteImageFromPicture([FromBody] JObject data)
@@ -816,9 +817,16 @@
};
}
+ // 鑾峰彇鍙�夌殑鍥剧墖ID锛岀敤浜庡垹闄ゅ崟寮犲浘鐗�
+ decimal? imageId = null;
+ if (data["imageId"] != null)
+ {
+ imageId = Convert.ToDecimal(data["imageId"].ToString());
+ }
+
// 璋冪敤鏈嶅姟鏂规硶鍒犻櫎鍥剧墖
var service = new RKJService();
- var (status, message) = service.DeleteImageFromPicture(Convert.ToDecimal(id));
+ var (status, message) = service.DeleteImageFromPicture(Convert.ToDecimal(id), imageId);
return new ResponseResult
{
diff --git a/StandardInterface/MESApplication/Controllers/QC/SJController.cs b/StandardInterface/MESApplication/Controllers/QC/SJController.cs
index 7591679..3fb8e09 100644
--- a/StandardInterface/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/SJController.cs
@@ -577,7 +577,7 @@
/// <summary>
/// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
/// </summary>
- /// <param name="data">鍖呭惈妫�楠岄」鐩甀D鐨凧SON鏁版嵁</param>
+ /// <param name="data">鍖呭惈妫�楠岄」鐩甀D鍜屽彲閫夌殑鍥剧墖ID鐨凧SON鏁版嵁</param>
/// <returns>鍒犻櫎缁撴灉</returns>
[HttpPost("DeleteImageFromPicture")]
public ResponseResult DeleteImageFromPicture([FromBody] JObject data)
@@ -595,10 +595,17 @@
}
var id = Convert.ToDecimal(data["id"].ToString());
+
+ // 鑾峰彇鍙�夌殑鍥剧墖ID锛岀敤浜庡垹闄ゅ崟寮犲浘鐗�
+ decimal? imageId = null;
+ if (data["imageId"] != null)
+ {
+ imageId = Convert.ToDecimal(data["imageId"].ToString());
+ }
// 璋冪敤鏈嶅姟鏂规硶鍒犻櫎鍥剧墖
var service = new SJService();
- var (status, message) = service.DeleteImageFromPicture(id);
+ var (status, message) = service.DeleteImageFromPicture(id, imageId);
return new ResponseResult
{
diff --git a/StandardInterface/MESApplication/Controllers/QC/XJController.cs b/StandardInterface/MESApplication/Controllers/QC/XJController.cs
index 18c4299..496e9a9 100644
--- a/StandardInterface/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardInterface/MESApplication/Controllers/QC/XJController.cs
@@ -845,9 +845,16 @@
};
}
+ // 鑾峰彇鍙�夌殑鍥剧墖ID锛岀敤浜庡垹闄ゅ崟寮犲浘鐗�
+ decimal? imageId = null;
+ if (data["imageId"] != null)
+ {
+ imageId = Convert.ToDecimal(data["imageId"].ToString());
+ }
+
// 璋冪敤鏈嶅姟鏂规硶鍒犻櫎鍥剧墖
var service = new XJService();
- var (status, message) = service.DeleteImageFromPicture(Convert.ToDecimal(id));
+ var (status, message) = service.DeleteImageFromPicture(Convert.ToDecimal(id), imageId);
return new ResponseResult
{
--
Gitblit v1.9.3