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/MESApplication/Controllers/QC/RKJController.cs | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 150 insertions(+), 13 deletions(-)
diff --git a/StandardInterface/MESApplication/Controllers/QC/RKJController.cs b/StandardInterface/MESApplication/Controllers/QC/RKJController.cs
index 2f8057f..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)
@@ -574,16 +575,26 @@
/// <summary>
/// 鑾峰彇闄勪欢淇℃伅
/// </summary>
- /// <param name="data">鍖呭惈itemNo鐨凧SON瀵硅薄</param>
+ /// <param name="data">鍖呭惈itemNo銆乸rojName銆乫romPage鐨凧SON瀵硅薄</param>
/// <returns>闄勪欢鍒楄〃</returns>
[HttpPost("getAttachments")]
public ResponseResult GetAttachments([FromBody] JObject data)
{
var itemNo = data["itemNo"]?.ToString();
+ var projName = data["projName"]?.ToString();
+ var fromPage = data["fromPage"]?.ToString(); // 鏂板鍙傛暟
+
+ // 鏉′欢杩囨护閫昏緫锛氭牴鎹甪romPage鍐冲畾鏄惁杩囨护
+ string filterProjName = null;
+ if (fromPage == "Detail" && !string.IsNullOrEmpty(projName))
+ {
+ filterProjName = projName; // Detail椤甸潰闇�瑕佽繃婊�
+ }
+
try
{
dynamic resultInfos = new System.Dynamic.ExpandoObject();
- var tbBillList = new RKJService().GetAttachments(itemNo);
+ var tbBillList = new RKJService().GetAttachments(itemNo, filterProjName);
if (tbBillList == null || tbBillList.Count == 0)
{
return new ResponseResult
@@ -612,10 +623,10 @@
/// </summary>
/// <param name="itemNo">鐗╂枡缂栫爜</param>
/// <param name="fileName">鏂囦欢鍚�</param>
- /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+ /// <param name="projName">椤圭洰鍚嶇О</param>
/// <returns>鏂囦欢鍐呭</returns>
- [HttpGet("PreviewFtpFile")]
- public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
+ [HttpGet("previewFtpFile")]
+ public IActionResult PreviewFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string projName = null)
{
try
{
@@ -626,7 +637,7 @@
Response.Headers.Add("Access-Control-Expose-Headers", "Content-Type, Content-Length");
var service = new RKJService();
- var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
+ var fileBytes = service.GetFtpFile(itemNo, fileName, projName);
if (fileBytes == null || fileBytes.Length == 0)
{
@@ -649,10 +660,10 @@
/// </summary>
/// <param name="itemNo">鐗╂枡缂栫爜</param>
/// <param name="fileName">鏂囦欢鍚�</param>
- /// <param name="ftpServer">FTP鏈嶅姟鍣ㄥ湴鍧�</param>
+ /// <param name="projName">椤圭洰鍚嶇О</param>
/// <returns>鏂囦欢涓嬭浇</returns>
- [HttpGet("DownloadFtpFile")]
- public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string ftpServer)
+ [HttpGet("downloadFtpFile")]
+ public IActionResult DownloadFtpFile([FromQuery] string itemNo, [FromQuery] string fileName, [FromQuery] string projName = null)
{
try
{
@@ -663,7 +674,7 @@
Response.Headers.Add("Access-Control-Expose-Headers", "Content-Disposition, Content-Length, Content-Type");
var service = new RKJService();
- var fileBytes = service.GetFtpFile(itemNo, fileName, ftpServer);
+ var fileBytes = service.GetFtpFile(itemNo, fileName, projName);
if (fileBytes == null || fileBytes.Length == 0)
{
@@ -708,4 +719,130 @@
return Ok();
}
+
+ /// <summary>
+ /// 涓婁紶鍥剧墖鍒版楠岄」鐩殑PICTURE瀛楁
+ /// </summary>
+ /// <param name="file">涓婁紶鐨勫浘鐗囨枃浠�</param>
+ /// <param name="id">妫�楠岄」鐩甀D</param>
+ /// <param name="gid">妫�楠屽崟ID</param>
+ /// <param name="billNo">宸ュ崟鍙�</param>
+ /// <param name="createBy">鍒涘缓浜�</param>
+ /// <returns>涓婁紶缁撴灉</returns>
+ [HttpPost("UploadImageToPicture")]
+ public ResponseResult UploadImageToPicture(IFormFile file, [FromForm] string id, [FromForm] string gid, [FromForm] string billNo, [FromForm] string createBy)
+ {
+ try
+ {
+ // 鍙傛暟楠岃瘉
+ if (file == null || file.Length == 0)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "璇烽�夋嫨瑕佷笂浼犵殑鍥剧墖鏂囦欢",
+ data = null
+ };
+ }
+
+ if (string.IsNullOrEmpty(id))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "妫�楠岄」鐩甀D涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ if (string.IsNullOrEmpty(createBy))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鍒涘缓浜轰笉鑳戒负绌�",
+ data = null
+ };
+ }
+
+ // 璇诲彇鏂囦欢瀛楄妭鏁扮粍
+ byte[] imageBytes;
+ using (var memoryStream = new MemoryStream())
+ {
+ file.CopyTo(memoryStream);
+ imageBytes = memoryStream.ToArray();
+ }
+
+ // 璋冪敤鏈嶅姟鏂规硶淇濆瓨鍥剧墖
+ var service = new RKJService();
+ var (status, message) = service.UploadImageToPicture(Convert.ToDecimal(id), imageBytes, file.FileName, createBy);
+
+ return new ResponseResult
+ {
+ status = status,
+ message = message,
+ data = null
+ };
+ }
+ catch (Exception ex)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = $"涓婁紶鍥剧墖澶辫触锛歿ex.Message}",
+ data = null
+ };
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎妫�楠岄」鐩殑鍥剧墖
+ /// </summary>
+ /// <param name="data">鍖呭惈妫�楠岄」鐩甀D鍜屽彲閫夌殑鍥剧墖ID鐨凧SON瀵硅薄</param>
+ /// <returns>鍒犻櫎缁撴灉</returns>
+ [HttpPost("DeleteImageFromPicture")]
+ public ResponseResult DeleteImageFromPicture([FromBody] JObject data)
+ {
+ try
+ {
+ var id = data["id"]?.ToString();
+
+ if (string.IsNullOrEmpty(id))
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = "妫�楠岄」鐩甀D涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ // 鑾峰彇鍙�夌殑鍥剧墖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), imageId);
+
+ return new ResponseResult
+ {
+ status = status,
+ message = message,
+ data = null
+ };
+ }
+ catch (Exception ex)
+ {
+ return new ResponseResult
+ {
+ status = 1,
+ message = $"鍒犻櫎鍥剧墖澶辫触锛歿ex.Message}",
+ data = null
+ };
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3