From 92c92d9bfb4431a8e2f4b8ac494547d50ea3a7f6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 二月 2025 17:25:06 +0800
Subject: [PATCH] 板面
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 108 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 89 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 84acee8..8730cd2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -20,6 +20,34 @@
public Frm_MesQmAql1()
{
InitializeComponent();
+ object[] _objAry = { "A",
+ "B",
+ "C",
+ "D",
+ "E",
+ "F",
+ "G",
+ "H",
+ "I",
+ "J",
+ "K",
+ "L",
+ "M",
+ "N",
+ "O",
+ "P",
+ "Q",
+ "R",
+ "S",
+ "T"};
+ this.repositoryItemComboBox1.Items.AddRange(_objAry);
+ this.repositoryItemComboBox2.Items.AddRange(_objAry);
+ this.repositoryItemComboBox3.Items.AddRange(_objAry);
+ this.repositoryItemComboBox4.Items.AddRange(_objAry);
+ this.repositoryItemComboBox5.Items.AddRange(_objAry);
+ this.repositoryItemComboBox6.Items.AddRange(_objAry);
+ this.repositoryItemComboBox7.Items.AddRange(_objAry);
+ this.repositoryItemComboBox8.Items.AddRange(_objAry);
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -30,9 +58,9 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(this.GetType().FullName,gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(this.GetType().FullName,gridView1,picCheckBox, this, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -48,7 +76,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -61,16 +89,25 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_sampleSizeNo, gridView1);
+ lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- getPageList(this.pageBar1.CurrentPage);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ gridView1.SetFocusedRowCellValue("ftwoChecked", true);
+ gridView1.SetFocusedRowCellValue("isenabled", true);
+ gridView1.SetFocusedRowCellValue("ftwoCheckor", "宸叉壒鍑�");
+ gridView1.SetFocusedRowCellValue("ftwoCheckdate", DateTime.Now.ToString());
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -150,7 +187,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -168,9 +205,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);
}
@@ -191,14 +229,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>
@@ -277,6 +316,17 @@
{
var row = gvMx1.GetDataRow(i);
if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["LotFrom"].ToString()))
+ {
+ MsgHelper.ShowError("鎵归噺寮�濮嬩笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["LotTo"].ToString()))
+ {
+ MsgHelper.ShowError("鎵归噺缁撴潫涓嶈兘涓虹┖锛�");
+ return;
+ }
qmaql2.Add(new MesQmAql2
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
@@ -291,12 +341,24 @@
FlevelIii = row["FlevelIii"].ToString(),
Memo = row["Memo"].ToString()
});
+ }
}
var qmaql3 = new List<MesQmAql3>();
for (var i = 0; i < gvMx2.DataRowCount; i++)
{
var row = gvMx2.GetDataRow(i);
if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["FsampleSizeWord"].ToString()))
+ {
+ MsgHelper.ShowError("鏍锋湰澶у皬涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["SampleSizeWord"].ToString()))
+ {
+ MsgHelper.ShowError("鏍锋湰瀛楃爜涓嶈兘涓虹┖锛�");
+ return;
+ }
qmaql3.Add(new MesQmAql3
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
@@ -320,6 +382,7 @@
Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
Memo = row["Memo"].ToString()
});
+ }
}
if (qmaql2.Count <= 0)
{
@@ -358,6 +421,7 @@
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -396,6 +460,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -453,6 +518,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -468,6 +534,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
@@ -603,9 +670,12 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
--
Gitblit v1.9.3