From 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 12:45:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 13c7320..45c1491 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -212,6 +212,10 @@
txt_lookupTypeCode.Focus();
return;
}
+
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+
var lst = new List<MesSysLookups>();
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
@@ -219,9 +223,7 @@
if (row != null)
lst.Add(new MesSysLookups
{
- Guid = row["Guid"].ToString().Length > 0
- ? Guid.Parse(row["Guid"].ToString())
- : Guid.Empty,
+ Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
LookupName = row["LookupName"].ToString(),
LookupValue = row["LookupValue"].ToString()
});
@@ -229,9 +231,8 @@
var _obj = new MesSysLookupTypes
{
- Guid = lbGuid.Text.Trim().Length > 0
- ? Guid.Parse(lbGuid.Text.Trim())
- : Guid.Empty,
+
+ Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
LookupTypeCode = txt_lookupTypeCode.Text,
LookupTypeName = txt_lookupTypeName.Text,
list = lst
--
Gitblit v1.9.3