From c0575b3330ef57fffd9e617eb25ea38f821c0aa7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 31 十月 2024 10:19:43 +0800
Subject: [PATCH] 检验项目增加了审核
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 94 +++++++++++++----------------------------------
1 files changed, 26 insertions(+), 68 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 13c7320..bc9da41 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -10,7 +10,6 @@
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -28,9 +27,9 @@
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -73,32 +72,35 @@
{
getPageList(curPage, pageSize);
}
-
+
/// <summary>
- /// 鏌ヨ浜嬩欢
+ /// 鍙嶅鏍�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- var frm =
- new ShowFilter(gridView1.Columns,
- _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_lookupTypeCode, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
- /// 鏌ヨ鍥炶皟
+ /// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- _filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_lookupTypeCode, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
-
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -108,49 +110,7 @@
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
}
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lookupTypeCode, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn =
- UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -177,7 +137,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -212,6 +171,9 @@
txt_lookupTypeCode.Focus();
return;
}
+
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
var lst = new List<MesSysLookups>();
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
@@ -219,9 +181,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 +189,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
@@ -249,8 +208,7 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls,
- false);
+ getModel(lbGuid.Text, false, 1);
}
}
catch (Exception ex)
--
Gitblit v1.9.3