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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index a3c2f1b..45c1491 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -7,19 +7,19 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
-using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm
+namespace Gs.DevApp.DevFrm.QC
{
public partial class Frm_IQCLookups : XtraForm
{
- private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesSysLookupTypesManager/";
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_IQCLookups()
{
@@ -213,6 +213,9 @@
return;
}
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+
var lst = new List<MesSysLookups>();
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
@@ -220,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()
});
@@ -230,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