From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 148 +++++++++++++++++++++++++++----------------------
1 files changed, 81 insertions(+), 67 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index dc7396d..5bc3a91 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -48,27 +48,53 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txtJianYan.KeyDown += TxtJianYan_KeyDown;
- this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- btnIpt.Click += BtnIpt_Click;
- }
- /// <summary>
- /// 鎵归噺褰曞叆
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void BtnIpt_Click(object sender, EventArgs e)
- {
- Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim() );
- frm.ShowDialog();
+ //閲嶆柊鍔犺浇
+ this.btnLoad.Click += (s, e) =>
+ {
+ if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛焅n\r璇ユ搷浣滃皢浼氭竻绌轰箣鍓嶇殑妫�楠岃褰曪紒"))
+ return;
+ string strGuid = lbGuid.Text.Trim();
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ //鎵归噺褰曞叆
+ btnIpt.Click += (s, e) =>
+ {
+ Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim());
+ frm.ShowDialog();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -83,43 +109,7 @@
getList12(rowGuid);
}
}
- /// <summary>
- /// 閲嶆柊鍔犺浇妫�楠�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void BtnLoad_Click(object sender, EventArgs e)
- {
- if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛岃鎿嶄綔灏嗕細娓呯┖涔嬪墠鐨勬楠岃褰曪紵"))
- return;
- string strGuid = lbGuid.Text.Trim();
- if (string.IsNullOrEmpty(strGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = strGuid,
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- getModel(lbGuid.Text.Trim());
- }
- else
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+
/// <summary>
/// 杈撳叆妫�楠屼簨浠�
/// </summary>
@@ -160,7 +150,7 @@
{
inOrderGuid1 = UtilityHelper.ToGuid(lbGuid.Text.Trim()), ////杩欐槸妫�楠屽崟guid
inOrderGuid5 = guid5,//杩欐槸鎶芥牱鐨刧uid
- inP1 = _strCmd,//杩欐槸9锛屾湁鍙兘鏄�19锛屾垨鑰�0k-19,鎴栬�卬g-19
+ inP1 = _strCmd,//鎴栬��0k-19,鎴栬�卬g-19
};
try
{
@@ -204,7 +194,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -253,7 +243,7 @@
return;
if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
{
- if (string.IsNullOrEmpty(txt_remarks.Text.Trim()) )
+ if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
{
MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
return;
@@ -381,6 +371,7 @@
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+
}
}
catch (Exception ex)
@@ -397,7 +388,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and isnull(fsubmit,0)=0";
+ // _sbSqlWhere += " and isnull(fsubmit,0)=0";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -413,7 +404,7 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -431,7 +422,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid)
{
@@ -492,7 +482,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
@@ -503,7 +492,7 @@
/// <param name="e"></param>
private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
{
- if (e.Page.Name == "xtraTabPage3")
+ if (e.Page.Name == "tabMxPage2")
{
getFileList();
}
@@ -558,21 +547,39 @@
};
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
- var dd = UtilityHelper.ReturnToList(strReturn);
- var dt = dd.rtnData;
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ JArray array1 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array1.Add(a);
+ }
+ DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt1;
+ gcMx3.ForceInitialize();
+ gvMx3.BestFitColumns();
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
-
+ /// <summary>
+ /// 鍒犻櫎涓婁紶
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
@@ -601,7 +608,11 @@
}
}
}
-
+ /// <summary>
+ /// 鏌ョ湅涓婁紶
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
@@ -620,10 +631,13 @@
{
Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
-
}
}
-
+ /// <summary>
+ /// 涓嬭浇涓婁紶
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
--
Gitblit v1.9.3