From 45a69e109d3ed2f3ba6d03f722021d019cb8792a Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 18 十一月 2025 10:40:28 +0800
Subject: [PATCH] 查询报工记录,获取最后一条报工记录,改为实际的工单ID
---
Services/MesCutterLedgerManager.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index 2d57494..68c3e60 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -66,34 +66,33 @@
int? useLimit,
decimal? sdjs = null,
decimal? xdjs = null,
- decimal? modlLifeWorning = null)
+ decimal? modlLifeWorning = null) // 鏂板锛氬鍛芥瘮棰勮鍊�(0~1鐨勫皬鏁�)
{
- var parameters = new List<SugarParameter>
+ var parameters = new[]
{
- new SugarParameter("V_WORK_ORDER_NO", workOrderNo) { DbType = SystemDataDbType.String },
- new SugarParameter("V_MACHINE_NO", machineNo) { DbType = SystemDataDbType.String },
- new SugarParameter("V_TOOL_NO", toolNo) { DbType = SystemDataDbType.String },
- new SugarParameter("V_TYPE", type) { DbType = SystemDataDbType.String },
- new SugarParameter("V_USE_LIMIT", useLimit ?? (object)DBNull.Value) { DbType = SystemDataDbType.Int32 },
- new SugarParameter("V_SDJS", sdjs ?? (object)DBNull.Value) { DbType = SystemDataDbType.Decimal },
- new SugarParameter("V_XDJS", xdjs ?? (object)DBNull.Value) { DbType = SystemDataDbType.Decimal },
- new SugarParameter("V_MODL_LIFE_WORNING", modlLifeWorning ?? (object)DBNull.Value) { DbType = SystemDataDbType.Decimal },
- new SugarParameter("PO_OUTMSG", null, SystemDataDbType.String, ParameterDirection.Output, 200),
- new SugarParameter("PO_OUTSUM", null, SystemDataDbType.Int32, ParameterDirection.Output)
- };
-
+ 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 },
+ new SugarParameter("V_MODL_LIFE_WORNING", modlLifeWorning ?? (object)DBNull.Value) // 鏂板
+ };
try
{
- Db.Ado.UseStoredProcedure().GetDataTable("PROC_TOOL_ACTION", parameters.ToArray());
-
- var outMsg = parameters[8].Value?.ToString();
- var outSum = parameters[9].Value == DBNull.Value ? (int?)null : Convert.ToInt32(parameters[9].Value);
-
+ Db.Ado.UseStoredProcedure().SqlQuery<object>("PROC_TOOL_ACTION", parameters);
+ 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}");
+ // 鍙湁瀛樺偍杩囩▼鏈韩鎵ц寮傚父鎵嶄細杩涘叆杩欓噷
+ throw new Exception($"{ex.Message}");
}
}
--
Gitblit v1.9.3