From c3ebc2116abc274eb2220e7a24c4ca03acad3a1d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 21 四月 2025 17:49:19 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 184 +++++++++++++++++++++++++---------------------
1 files changed, 100 insertions(+), 84 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 71bacbd..bd881d6 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -2,13 +2,11 @@
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;
using System;
using System.Collections.Generic;
using System.Data;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -20,63 +18,60 @@
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;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ this.toolBarMenu1.getXmlConfig();
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.JumpTab(xtraTabControl1, 0);
- });
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- Task.Delay(100);
- getPageList(1);
- }
- /// <summary>
- /// 鎵瑰噯
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_sampleSizeNo, gridView1);
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- getPageList(this.pageBar1.CurrentPage);
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+
/// <summary>
/// 鍙嶅鏍�
@@ -98,7 +93,7 @@
{
_toolCk(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -108,30 +103,7 @@
{
getPageList(curPage);
}
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
+
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -150,7 +122,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,10 +140,11 @@
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);
}
@@ -222,11 +195,12 @@
{
getModel(rowGuid);
}
- else {
+ else
+ {
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gridViews);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
}
}
/// <summary>
@@ -241,8 +215,8 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
txt_createDate.Text = DateTime.Now.ToString("G");
txt_fversion.Text = "1";
@@ -269,8 +243,10 @@
return;
}
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
gvMx2.CloseEditor();
+ gvMx2.PostEditor();
gvMx2.UpdateCurrentRow();
try
{
@@ -279,6 +255,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()),
@@ -293,12 +280,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()),
@@ -322,6 +321,7 @@
Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
Memo = row["Memo"].ToString()
});
+ }
}
if (qmaql2.Count <= 0)
{
@@ -359,7 +359,9 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -372,7 +374,7 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
+
}
/// <summary>
@@ -382,7 +384,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -392,16 +394,15 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gcMain1.BindingContext = new BindingContext();
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
@@ -441,7 +442,7 @@
List<GridView> gvList = new List<GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
JArray mesQmAql3s = new JArray();
@@ -455,6 +456,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ //gvMx1.BestFitColumns();
}
else
{
@@ -470,6 +472,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ // gvMx2.BestFitColumns();
}
else
{
@@ -485,9 +488,15 @@
}
}
+ /// <summary>
+ /// 鍒犻櫎瀛楃爜
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
@@ -523,7 +532,11 @@
}
}
}
-
+ /// <summary>
+ /// 鍒犻櫎鏂规
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx2.CloseEditor();
@@ -605,9 +618,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