From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
index 78543c2..7f63a38 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
@@ -41,11 +41,11 @@
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
await Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -98,7 +98,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1, "typeNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1, "typeNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -116,9 +116,10 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 0)
- getPageList(this.pageBar1.CurrentPage);
+ { }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -139,14 +140,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
/// <summary>
@@ -164,7 +166,14 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -194,8 +203,8 @@
var _obj = new MesDefectType()
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- TypeNo=txt_typeNo.Text.Trim(),
- TypeMemo=txt_typeMemo.Text.Trim(),
+ TypeNo = txt_typeNo.Text.Trim(),
+ TypeMemo = txt_typeMemo.Text.Trim(),
};
try
{
@@ -207,6 +216,7 @@
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -240,6 +250,8 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
--
Gitblit v1.9.3