From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 368 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 252 insertions(+), 116 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index d05e320..04d1019 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -8,7 +8,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -21,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;
@@ -31,11 +58,15 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ 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);
+ });
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -48,7 +79,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 +92,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)
{
@@ -86,11 +126,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_sampleSizeNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(0);
}
/// <summary>
@@ -100,13 +136,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_sampleSizeNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
+ _toolCk(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -158,7 +190,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("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -176,9 +208,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);
}
@@ -199,14 +232,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>
@@ -224,7 +258,17 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<GridView> gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gridViews);
+ }
}
/// <summary>
/// 鏂板浜嬩欢
@@ -239,11 +283,10 @@
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
txt_createDate.Text = DateTime.Now.ToString("G");
txt_fversion.Text = "1";
-
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -270,98 +313,132 @@
gvMx1.UpdateCurrentRow();
gvMx2.CloseEditor();
gvMx2.UpdateCurrentRow();
- var qmaql2 = new List<MesQmAql2>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- qmaql2.Add(new MesQmAql2
- {
- Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
- LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
- LotTo = Convert.ToInt32(row["LotTo"].ToString()),
- FlevelS1 = row["FlevelS1"].ToString(),
- FlevelS2 = row["FlevelS2"].ToString(),
- FlevelS3 = row["FlevelS3"].ToString(),
- FlevelS4 = row["FlevelS4"].ToString(),
- FlevelI = row["FlevelI"].ToString(),
- FlevelIi = row["FlevelIi"].ToString(),
- 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)
- qmaql3.Add(new MesQmAql3
- {
- Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
- FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
- SampleSizeWord = row["SampleSizeWord"].ToString(),
- Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
- Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
- Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
- Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
- Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
- Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
- Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
- Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
- Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
- Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
- Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
- Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
- Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
- Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
- Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
- Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
- Memo = row["Memo"].ToString()
- });
- }
- if (qmaql2.Count <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
- return;
- }
- if (qmaql3.Count <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
- return;
- }
- var _obj = new MesQmAql1
- {
- Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
- SampleSizeName = txt_sampleSizeName.Text.Trim(),
- Memo = txt_memo.Text.Trim(),
- CreateDate = DateTime.Now,
- FtwoChecked = false,
- Isenabled = false,
- FoneChecked = false,
- Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
- MesQmAql2s = qmaql2,
- MesQmAql3s = qmaql3
- };
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
+ var qmaql2 = new List<MesQmAql2>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
{
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- List<GridView> gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- gridViews.Add(gvMx2);
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+ 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()),
+ LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
+ LotTo = Convert.ToInt32(row["LotTo"].ToString()),
+ FlevelS1 = row["FlevelS1"].ToString(),
+ FlevelS2 = row["FlevelS2"].ToString(),
+ FlevelS3 = row["FlevelS3"].ToString(),
+ FlevelS4 = row["FlevelS4"].ToString(),
+ FlevelI = row["FlevelI"].ToString(),
+ FlevelIi = row["FlevelIi"].ToString(),
+ 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()),
+ FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
+ SampleSizeWord = row["SampleSizeWord"].ToString(),
+ Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
+ Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
+ Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
+ Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
+ Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
+ Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
+ Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
+ Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
+ Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
+ Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
+ Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
+ Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
+ Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
+ Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
+ Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
+ Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
+ Memo = row["Memo"].ToString()
+ });
+ }
+ }
+ if (qmaql2.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+ return;
+ }
+ if (qmaql3.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ return;
+ }
+ var _obj = new MesQmAql1
+ {
+ Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+ SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
+ SampleSizeName = txt_sampleSizeName.Text.Trim(),
+ Memo = txt_memo.Text.Trim(),
+ CreateDate = DateTime.Now,
+ FtwoChecked = false,
+ Isenabled = false,
+ FoneChecked = false,
+ Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
+ MesQmAql2s = qmaql2,
+ MesQmAql3s = qmaql3
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ List<GridView> gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
+
}
/// <summary>
@@ -387,6 +464,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -444,6 +522,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -459,6 +538,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
@@ -551,5 +631,61 @@
}
}
}
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ ckValue = _inFieldValue,
+ parameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ 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)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3