From 6f195e602ec9de69c2a1d9731a366a234cc96fe3 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 13 十月 2025 15:44:01 +0800
Subject: [PATCH] 表格逻辑修改
---
Services/MesCutterLedgerManager.cs | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/Services/MesCutterLedgerManager.cs b/Services/MesCutterLedgerManager.cs
index 5c71128..cc7c505 100644
--- a/Services/MesCutterLedgerManager.cs
+++ b/Services/MesCutterLedgerManager.cs
@@ -95,23 +95,32 @@
{
var parameters = new[]
{
- new SugarParameter("V_WORK_ORDER_NO", workOrderNo),
- new SugarParameter("V_MACHINE_NO", machineNo),
- new SugarParameter("PO_CURSOR", null) { Direction = ParameterDirection.Output, DbType = SystemDataDbType.Object }
- };
- // 鍋囪瀛樺偍杩囩▼鍚嶄负 PROC_GET_FORM_DATA锛岃繑鍥炴父鏍�
- 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)
+ new SugarParameter("V_WORK_ORDER_NO", string.IsNullOrEmpty(workOrderNo) ? (object)DBNull.Value : workOrderNo),
+ new SugarParameter("V_MACHINE_NO", string.IsNullOrEmpty(machineNo) ? (object)DBNull.Value : machineNo),
+ new SugarParameter("PO_CURSOR", null) { Direction = ParameterDirection.Output, DbType = SystemDataDbType.Object }
+ };
+
+ try
{
- IDictionary<string, object> expando = new ExpandoObject();
- foreach (DataColumn col in result.Columns)
+ // 鍋囪瀛樺偍杩囩▼鍚嶄负 PROC_GET_FORM_DATA锛岃繑鍥炴父鏍�
+ 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)
{
- expando[col.ColumnName] = row[col];
+ 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);
}
- list.Add(expando);
+ return list;
}
- return list;
+ catch (Exception ex)
+ {
+ throw new Exception($"璋冪敤瀛樺偍杩囩▼ PROC_GET_FORM_DATA 澶辫触: {ex.Message}");
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3