From ee20b01733f0eef1db4a8743764ee517bd8cd859 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 10 十月 2025 14:37:33 +0800
Subject: [PATCH] 添加回传数据库字段
---
Controllers/MesCutterLedgerController.cs | 33 ++++++++++++++++++++-------------
Services/MesCutterLedgerManager.cs | 14 +++++++++-----
2 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/Controllers/MesCutterLedgerController.cs b/Controllers/MesCutterLedgerController.cs
index f2f5784..1d0bb8d 100644
--- a/Controllers/MesCutterLedgerController.cs
+++ b/Controllers/MesCutterLedgerController.cs
@@ -48,20 +48,27 @@
/// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
/// </summary>
[HttpPost("SubmitToolAction")]
- public IActionResult SubmitToolAction([FromBody] dynamic data)
+ public IActionResult SubmitToolAction(
+ [FromForm] string workOrderNo,
+ [FromForm] string machineNo,
+ [FromForm] string toolNo,
+ [FromForm] string type, // string 绫诲瀷
+ [FromForm] int? useLimit
+ )
{
- string workOrderNo = data.workOrderNo;
- string machineNo = data.machineNo;
- string toolNo = data.toolNo;
- string type = data.type;
- int? useLimit = data.useLimit;
-
- var result = m.SubmitToolAction(workOrderNo, machineNo, toolNo, type, useLimit);
- return Ok(new ResponseResult
+ try
{
- status = 0,
- message = "OK",
- data = result
- });
+ var result = m.SubmitToolAction(workOrderNo, machineNo, toolNo, type, useLimit);
+ return Ok(new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = result
+ });
+ }
+ catch (Exception ex)
+ {
+ return Ok(ResponseResult.ResponseError(ex));
+ }
}
}
\ No newline at end of file
diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index 1c824fb..45fc4b8 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -5,6 +5,7 @@
using System.Text;
using Newtonsoft.Json;
using SqlSugar;
+using System.Data;
namespace PadApplication.Services;
@@ -46,7 +47,6 @@
/// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
/// 浠呰礋璐ｅ弬鏁拌浆鍙戯紝鎵�鏈夋暟鎹啓鍏ョ敱瀛樺偍杩囩▼瀹屾垚銆�
/// </summary>
- /// <param name="workOrderNo">宸ュ崟鍙�</param>
/// <param name="machineNo">鏈哄彴缂栧彿</param>
/// <param name="toolNo">鍒�鍏风紪鍙�</param>
/// <param name="type">鎿嶄綔绫诲瀷锛堜笂鍒�銆佷笅鍒�锛�</param>
@@ -60,13 +60,17 @@
new SugarParameter("V_MACHINE_NO", machineNo),
new SugarParameter("V_TOOL_NO", toolNo),
new SugarParameter("V_TYPE", type),
- new SugarParameter("V_USE_LIMIT", useLimit ?? (object)DBNull.Value)
+ new SugarParameter("V_USE_LIMIT", useLimit ?? (object)DBNull.Value),
+ new SugarParameter("PO_OUTMSG", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.String, Size = 200 },
+ new SugarParameter("PO_OUTSUM", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.Int32 }
};
try
{
- var result = Db.Ado.SqlQuery<object>(
- "CALL PROC_TOOL_ACTION(:V_WORK_ORDER_NO, :V_MACHINE_NO, :V_TOOL_NO, :V_TYPE, :V_USE_LIMIT)", parameters);
- return result;
+ Db.Ado.UseStoredProcedure().SqlQuery<object>(
+ "PROC_TOOL_ACTION", parameters);
+ var outMsg = parameters[5].Value?.ToString();
+ var outSum = parameters[6].Value;
+ return new { outMsg, outSum };
}
catch (Exception ex)
{
--
Gitblit v1.9.3