From d35bb711f8d3d267b44b4a80c20e31dabf309ae7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 14 一月 2025 08:17:18 +0800
Subject: [PATCH] 其它入库
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 310 +++++++++++++++++++++++++++++++--------------------
1 files changed, 187 insertions(+), 123 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 2aae436..84acee8 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;
@@ -31,8 +30,19 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1, picCheckBox, this, "foneChecked", "");
+ 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.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -58,8 +68,7 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -77,11 +86,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>
@@ -91,24 +96,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>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
- }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -149,7 +139,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -177,8 +167,10 @@
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ getPageList(this.pageBar1.CurrentPage);
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -196,7 +188,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -223,7 +215,17 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ 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>
/// 鏂板浜嬩欢
@@ -232,8 +234,8 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
@@ -268,98 +270,107 @@
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)
+ 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)
+ {
+ 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);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
+
}
/// <summary>
@@ -403,14 +414,16 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid)
{
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -445,12 +458,10 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
foreach (var a in _job["rtnData"]["mesQmAql3s"])
{
mesQmAql3s.Add(a);
}
-
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(mesQmAql3s.ToString());
if (dt1.Rows.Count > 0)
{
@@ -500,7 +511,7 @@
JsonConvert.SerializeObject(lst));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -539,7 +550,7 @@
JsonConvert.SerializeObject(lst));
var _rtn =
UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -549,5 +560,58 @@
}
}
}
+
+ /// <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());
+ else
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3