From 07308fece83299f0eaa52354023bff81d9bafa11 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 28 七月 2025 12:57:24 +0800
Subject: [PATCH] 提交
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
index 83c180e..12bf154 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
@@ -1,6 +1,4 @@
-锘�
-using Gs.DevApp.DevFrm.QC;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -42,6 +40,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -242,6 +241,7 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
this.btnCopy.Enabled = true;
}
@@ -366,9 +366,18 @@
gvList.Add(gvMx1);
gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
-
toolBarMenu1.currentAction = "";
- //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+
+ //if (xtraTabControl1.TabPages.Count > 6)
+ //{
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ //}
+ //else
+ //{
+ // MessageBox.Show($"褰撳墠鍙湁 {xtraTabControl1.TabPages.Count} 涓�夐」鍗★紝鏃犳硶璺宠浆鍒扮7涓�");
+ //}
+
}
}
catch (Exception ex)
@@ -584,10 +593,10 @@
if (e.Button.Index == 0)
{
var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
+ var mxGuid2 = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
- if (string.IsNullOrEmpty(mxGuid))
+ if (string.IsNullOrEmpty(mxGuid2))
{
gvMx2.DeleteRow(rowhandle);
return;
@@ -595,7 +604,7 @@
var _obj = new
{
guid = lbGuid.Text.Trim(),//杩欐槸浜у搧鐨刧uid
- mxGuid = mxGuid,
+ mxGuid2 = mxGuid2,
};
try
{
@@ -605,7 +614,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ getModel(lbGuid.Text);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
--
Gitblit v1.9.3