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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
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
{
--
Gitblit v1.9.3