From 99602ec50c03bfa238aa9d06221e2f56ac6e05e3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 23 三月 2025 22:00:42 +0800
Subject: [PATCH] 物料信息
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 116 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 1772159..34d4fff 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,4 @@
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -32,6 +33,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -50,10 +52,23 @@
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();
+ }
+
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);
}
@@ -125,52 +140,27 @@
string _strCmd = txtJianYan.Text.Trim().ToUpper();
string _strOK = "OK";
string _strNG = "NG";
- int n = 0;
- if ((_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
+ if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
{
- if (!_strCmd.Contains("-"))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
- return;
- }
- string[] _ary = _strCmd.Split('-');
- if (_ary.Length != 2)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氾細璇锋纭娇鐢∣K 鎴� NG 鍛戒护!");
- return;
- }
- string _str1 = _ary[0];
- if (!(_str1 == _strOK || _str1 == _strNG))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
- return;
- }
- string _str2 = _ary[1];
- if (int.TryParse(_str2, out n))
- {
- }
- else
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
- return;
- }
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
}
- else
+ if (!_strCmd.Contains("-"))
{
- if (int.TryParse(_strCmd, out n))
- {
- }
- else
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
- return;
- }
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ string[] _ary = _strCmd.Split('-');
+ if (_ary.Length != 2)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
}
var _obj = new
{
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
{
@@ -214,7 +204,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();
}
@@ -423,7 +413,7 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -540,10 +530,10 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMx3.BindingContext = new BindingContext();
- gcMx3.DataSource = dt;
- gcMx3.ForceInitialize();
- gvMx3.BestFitColumns();
+ gcMx4.BindingContext = new BindingContext();
+ gcMx4.DataSource = dt;
+ gcMx4.ForceInitialize();
+ gvMx4.BestFitColumns();
}
else
{
@@ -568,29 +558,43 @@
};
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);
}
-
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- var rowhandle = gvMx3.FocusedRowHandle;
+ var rowhandle = gvMx4.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
- var dr = gvMx3.GetDataRow(rowhandle);
+ var dr = gvMx4.GetDataRow(rowhandle);
var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
@@ -602,7 +606,7 @@
strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
JsonConvert.SerializeObject(lst));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) gvMx3.DeleteRow(rowhandle);
+ if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -614,14 +618,14 @@
private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- var rowhandle = gvMx3.FocusedRowHandle;
+ var rowhandle = gvMx4.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
try
{
- var dr = gvMx3.GetDataRow(rowhandle);
+ var dr = gvMx4.GetDataRow(rowhandle);
var urlPath = dr["urlPath"].ToString();
Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
frm.ShowDialog();
@@ -636,14 +640,14 @@
private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- var rowhandle = gvMx3.FocusedRowHandle;
+ var rowhandle = gvMx4.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
try
{
- var dr = gvMx3.GetDataRow(rowhandle);
+ var dr = gvMx4.GetDataRow(rowhandle);
var urlPath = dr["urlPath"].ToString();
using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
{
--
Gitblit v1.9.3