From 3705fba059c0103befd123b41ba2b8dda855d884 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 13 十月 2025 09:34:21 +0800
Subject: [PATCH] 添加上下刀接口
---
Controllers/MesCutterLedgerController.cs | 25 ++++++++++++++++---------
Services/MesCutterLedgerManager.cs | 24 +++++++++++++-----------
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/Controllers/MesCutterLedgerController.cs b/Controllers/MesCutterLedgerController.cs
index 709a95b..adac9b0 100644
--- a/Controllers/MesCutterLedgerController.cs
+++ b/Controllers/MesCutterLedgerController.cs
@@ -16,12 +16,15 @@
{
private readonly MesCutterLedgerManager m = new();
+ // 鍔犲叆 sdjs銆亁djs 涓哄彲绌� decimal锛屼繚鎸佷笌鍓嶇 JSON 瀛楁鍚嶄竴鑷�
public record ToolActionRequest(
string workOrderNo,
string machineNo,
string toolNo,
string type,
- int? useLimit
+ int? useLimit,
+ decimal? sdjs,
+ decimal? xdjs
);
public record FormDataRequest(
@@ -58,19 +61,23 @@
/// <summary>
/// 涓婁笅鍒�鎿嶄綔锛堜笂鍒�type=0锛屼笅鍒�type=1锛�
+ /// 鎺ユ敹 JSON 璇锋眰浣擄紙Content-Type: application/json锛夛紝骞跺皢 sdjs/xdjs 涓�骞朵紶鍏ユ湇鍔″眰
/// </summary>
[HttpPost("SubmitToolAction")]
- public IActionResult SubmitToolAction(
- [FromForm] string workOrderNo,
- [FromForm] string machineNo,
- [FromForm] string toolNo,
- [FromForm] string type, // string 绫诲瀷
- [FromForm] int? useLimit
- )
+ public IActionResult SubmitToolAction([FromBody] ToolActionRequest req)
{
try
{
- var result = m.SubmitToolAction(workOrderNo, machineNo, toolNo, type, useLimit);
+ var result = m.SubmitToolAction(
+ req.workOrderNo,
+ req.machineNo,
+ req.toolNo,
+ req.type,
+ req.useLimit,
+ req.sdjs,
+ req.xdjs
+ );
+
return Ok(new ResponseResult
{
status = 0,
diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index dea82ff..5c71128 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -54,24 +54,26 @@
/// <param name="type">鎿嶄綔绫诲瀷锛堜笂鍒�銆佷笅鍒�锛�</param>
/// <param name="useLimit">浣跨敤涓婇檺</param>
/// <returns>瀛樺偍杩囩▼鎵ц缁撴灉</returns>
- public object SubmitToolAction(string workOrderNo, string machineNo, string toolNo, string type, int? useLimit)
+ public object SubmitToolAction(string workOrderNo, string machineNo, string toolNo, string type, int? useLimit, decimal? sdjs = null, decimal? xdjs = null)
{
var parameters = new[]
{
- new SugarParameter("V_WORK_ORDER_NO", workOrderNo),
- 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("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 }
- };
+ new SugarParameter("V_WORK_ORDER_NO", workOrderNo),
+ 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_SDJS", sdjs ?? (object)DBNull.Value),
+ new SugarParameter("V_XDJS", xdjs ?? (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
{
Db.Ado.UseStoredProcedure().SqlQuery<object>(
"PROC_TOOL_ACTION", parameters);
- var outMsg = parameters[5].Value?.ToString();
- var outSum = parameters[6].Value;
+ var outMsg = parameters[7].Value?.ToString();
+ var outSum = parameters[8].Value;
// 杩欓噷 outMsg 宸茬粡鍖呭惈浜嗗瓨鍌ㄨ繃绋嬫瘡姝ML鐨勮缁嗛敊璇俊鎭�
return new { outMsg, outSum };
}
--
Gitblit v1.9.3