From 7f7b09f2cb3dbbdfe4a4bf078bfcde6cfbe76595 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 15:45:35 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 1e71466..79650d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -79,7 +79,11 @@
}
DataTable _newTable = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- DataTable _oldTable = _newTable.Clone();
+ DataTable _oldTable = gridControl1.DataSource as DataTable;
+ if (_oldTable == null)
+ {
+ _oldTable = _newTable.Clone();
+ }
DataRow[] sourceRows = _newTable.Select();
for (int i = 0; i < sourceRows.Length; i++)
{
--
Gitblit v1.9.3