From 414050ab3157ab7bc35ad5218594393711d2e447 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 13 十月 2025 16:09:28 +0800
Subject: [PATCH] Revert "BUG修改"
---
Services/MesCutterLedgerManager.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index 45fc4b8..38bac6e 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -6,6 +6,8 @@
using Newtonsoft.Json;
using SqlSugar;
using System.Data;
+using System.Dynamic;
+using SystemDataDbType = System.Data.DbType;
namespace PadApplication.Services;
@@ -52,7 +54,7 @@
/// <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[]
{
@@ -61,6 +63,8 @@
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 }
};
@@ -68,14 +72,55 @@
{
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 };
}
catch (Exception ex)
{
+ // 鍙湁瀛樺偍杩囩▼鏈韩鎵ц寮傚父鎵嶄細杩涘叆杩欓噷
throw new Exception($"{ex.Message}");
}
}
+ /// <summary>
+ /// 鑾峰彇宸ュ崟琛ㄥ崟鏁版嵁锛堥�氳繃宸ュ崟缂栧彿鍜屾満鍙扮紪鍙锋煡璇級銆�
+ /// 浠呰礋璐ｅ弬鏁拌浆鍙戯紝鎵�鏈夋暟鎹鍙栫敱瀛樺偍杩囩▼瀹屾垚銆�
+ /// </summary>
+ /// <param name="workOrderNo">宸ュ崟缂栧彿</param>
+ /// <param name="machineNo">鏈哄彴缂栧彿</param>
+ /// <returns>琛ㄥ崟鏁版嵁鐨勫姩鎬佸垪琛�</returns>
+ public List<dynamic> GetFormData(string workOrderNo, string machineNo)
+ {
+ var parameters = new[]
+ {
+ new SugarParameter("V_WORK_ORDER_NO", string.IsNullOrEmpty(workOrderNo) ? (object)DBNull.Value : workOrderNo, System.Data.DbType.String),
+ new SugarParameter("V_MACHINE_NO", string.IsNullOrEmpty(machineNo) ? (object)DBNull.Value : machineNo, System.Data.DbType.String),
+ new SugarParameter("PO_CURSOR", null) { Direction = ParameterDirection.Output, DbType = System.Data.DbType.Object }
+ };
+
+ try
+ {
+ // 浣跨敤 SqlSugar 鐨勫瓨鍌ㄨ繃绋嬭皟鐢ㄦ柟寮�
+ var result = Db.Ado.UseStoredProcedure().GetDataTable("PROC_GET_FORM_DATA", parameters);
+
+ // DataTable 杞� List<dynamic>
+ var list = new List<dynamic>();
+ foreach (DataRow row in result.Rows)
+ {
+ IDictionary<string, object> expando = new ExpandoObject();
+ foreach (DataColumn col in result.Columns)
+ {
+ expando[col.ColumnName] = row[col] == DBNull.Value ? null : row[col];
+ }
+ list.Add(expando);
+ }
+ return list;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"璋冪敤瀛樺偍杩囩▼ PROC_GET_FORM_DATA 澶辫触: {ex.Message}");
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3