From 7e412b035c84cf6c8b486c8a8249383d715cbc15 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 19 五月 2025 15:58:04 +0800
Subject: [PATCH] 调整oa返回来的结果
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 580 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 375 insertions(+), 205 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index ebd329d..afd01ba 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,5 +1,4 @@
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -7,11 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Net.Http;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -19,59 +14,180 @@
{
public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
{
+ string _strTag = "N:涓嶅悎鏍�";
string _webServiceName = "MesQaItemsDetect01Manager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_MesQaItemsDetect01()
{
InitializeComponent();
- 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;
- this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- getPageList(1, UtilityHelper.GetPageSize());
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value, "0");
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
- //涓婁紶闄勪欢
- btnUpSelect.Click += BtnUpSelect_Click;
- btnUp.Click += BtnUp_Click;
- //鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
- gvMx2.OptionsFind.ShowSearchNavButtons = false;
- gvMx2.OptionsView.ShowGroupPanel = false;
- _setIno();
+ txtJianYan.KeyDown += TxtJianYan_KeyDown;
+ this.btnLoad.Click += BtnLoad_Click;
+ xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ btnIpt.Click += BtnIpt_Click;
+ btnYcReport.Click += BtnYcReport_Click;
}
-
-
/// <summary>
- /// 鍙屽嚮浜嬩欢
+ /// 鎵归噺褰曞叆
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ /// <exception cref="NotImplementedException"></exception>
+ private void BtnIpt_Click(object sender, EventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
+ bool bl = btnLoad.Enabled;
+ Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
+ frm.ShowDialog();
}
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
+ getPageList(1);
+ }
+ /// <summary>
+ /// 5琛ㄧ劍鐐规椂锛岄噸鏂拌鍙�12琛�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ string rowGuid = row["guid"].ToString();
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ 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(), "0");
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 杈撳叆妫�楠屼簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
+ {
+ int intHandle = this.gvMx1.FocusedRowHandle;
+ if (intHandle < 0)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
+ return;
+ }
+ if (e.KeyCode == Keys.Enter)
+ {
+ string guid5 = this.gvMx1.GetDataRow(intHandle)["guid"].ToString();
+ string _strCmd = txtJianYan.Text.Trim().ToUpper();
+ string _strOK = "OK";
+ string _strNG = "NG";
+ if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ if (!_strCmd.Contains("-"))
+ {
+ 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,//鎴栬��0k-19,鎴栬�卬g-19
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EdtModel12",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text.Trim(), guid5);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ }
+ txtJianYan.Text = "";
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -79,7 +195,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -88,7 +204,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -100,9 +219,14 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ /// <summary>
+ /// 鏃ュ織浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -111,50 +235,73 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
+ ///鎻愪氦妫�楠屼簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_releaseNo, gridView1, "lotNo");
+ toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
+ return;
+ if (txt_fcheckResu.Text.Trim() == _strTag)
+ {
+ if (string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
+ {
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏紓甯稿娉ㄨ鏄庯紒");
+ return;
+ }
+ };
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim(), "0");
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ int _inFieldValue = 1;
+ UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+
+ }
+
+ /// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
/// <summary>
/// 鍒锋柊浜嬩欢
@@ -163,8 +310,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), "0");
+ else
+ {
+ //_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>
/// 淇敼浜嬩欢
@@ -173,30 +332,29 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+ toolBarMenu1.currentAction = "edit";
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid, "0");
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ this.setEable(true);
+ }
}
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- gridViews.Add(gvMx2);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
+
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -205,15 +363,16 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ txt_fngDesc.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ fngDesc = txt_fngDesc.TextTxt.Trim(),
};
try
{
@@ -224,7 +383,11 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ this.setEable(false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+
}
}
catch (Exception ex)
@@ -238,32 +401,32 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -274,16 +437,23 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ /// <param name="guid5"></param>
+ private void getModel(string strGuid, string guid5)
{
+ 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,//涓诲缓
@@ -295,22 +465,36 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ btnYcReport.ToolTip = dy.toGuid.ToString();
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ setEable(isEdit);
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
{
array.Add(a);
}
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
+ gcMx1.DataSource = null;
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ ucUpFileList1.pGuid = lbGuid.Text.Trim();
+ if (guid5.Length > 10)
+ {
+ int rowHandle = 0;
+ rowHandle = gvMx1.LocateByValue(1, gvMx1.Columns["guid"], guid5);
+ if (rowHandle < 0)
+ rowHandle = 0;
+ gvMx1.FocusedRowHandle = rowHandle + 1;
+ }
+ // MessageBox.Show(rowHandle.ToString() + "**" + guid5);
}
else
{
@@ -324,109 +508,95 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
-
-
- #region 鏂囦欢涓婁紶
-
/// <summary>
- /// 閫夋嫨涓婁紶鏂囦欢
+ /// 閫夐」鍗″垏鎹�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void BtnUpSelect_Click(object sender, EventArgs e)
+ private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
{
- var openFileDialog = new OpenFileDialog();
- // 璁剧疆鍒濆鐩綍
- openFileDialog.InitialDirectory = "c:\\";
- // 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
- // 璁剧疆鏍囬
- openFileDialog.Title = "閫夋嫨鏂囦欢";
- // 鏄剧ず瀵硅瘽妗�
- var result = openFileDialog.ShowDialog();
- // 纭鐢ㄦ埛娌℃湁鍙栨秷鎿嶄綔
- if (result == DialogResult.OK)
+ if (e.Page.Name == "tabMxPage2")
{
- // 鑾峰彇閫変腑鐨勬枃浠惰矾寰�
- var filePath = openFileDialog.FileName;
- Console.WriteLine($"閫変腑鐨勬枃浠�: {filePath}");
- txtUpUrl.Text = filePath;
+ ucUpFileList1.getFileList();
}
}
/// <summary>
- /// 纭畾涓婁紶
+ /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
+ /// <param name="guid5"></param>
+ private void getList12(string guid5)
{
- var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
- var address = WebApiUrl + "Upload/UploadFile";
- var filePath = txtUpUrl.Text.Trim();
- var apiUrl = address; // 鏇挎崲涓轰綘鐨凙PI鍦板潃
- await UploadFileAsync(apiUrl, filePath);
- }
-
- private async Task UploadFileAsync(string url, string filePath)
- {
- UcLoading _loading = new UcLoading();
- using (var httpClient = new HttpClient())
- using (var form = new MultipartFormDataContent())
+ var _obj = new
{
- httpClient.DefaultRequestHeaders.Add("token",
- UtilityHelper.GetBasicAuthTicket());
- using (var fs = File.OpenRead(filePath))
- using (var streamContent = new StreamContent(fs))
- {
- form.Add(streamContent, "file", Path.GetFileName(filePath));
- var response = await httpClient.PostAsync(url, form);
- var responseString =
- await response.Content.ReadAsStringAsync();
- MessageBox.Show(responseString);
- }
- }
- _loading.Close();
- }
-
- #endregion
-
- private void _setIno()
- {
- txt_itemId.KeyFile = "id";
- txt_itemId.EditChanged += (s, e) =>
- {
- txt_itemModel.Text = this.txt_itemId.GetModel();
- txt_itemNo.Text = this.txt_itemId.GetCode();
+ parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ guid = UtilityHelper.ToGuid(guid5), //涓诲缓
};
- }
- /// <summary>
- /// 璇诲彇妫�楠岀粨鏋�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- var rowGuid = "";
- var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
- if (myDataRow == null) return;
- rowGuid = myDataRow["id"].ToString();
- var json = JsonConvert.SerializeObject(rowGuid);
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName+ "GetCheckResultList", json);
- 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="bl"></param>
+ private void setEable(bool bl)
+ {
+ txtJianYan.ReadOnly = !bl;
+ btnLoad.Enabled = bl;
+ btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
+ }
+
+ #region 鎵撳紑鐖朵翰绐楀彛濮旀墭锛屾煡鐪嬪紓甯告姤鍛�
+ public event EventHandler<UpdateParentEventArgs> ToUpdateParent;
+ private void BtnYcReport_Click(object sender, EventArgs e)
+ {
+ string _toGuid = (btnYcReport.ToolTip == null ? "" : btnYcReport.ToolTip.ToString());
+ if (string.IsNullOrEmpty(_toGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鏃犲紓甯告姤鍛婏紝鏌ョ湅澶辫触锛�");
+ return;
+ }
+ if (ToUpdateParent != null)
+ {
+ List<string> lst = new List<string>();
+ lst.Add("Gs.DevApp.DevFrm.QC.MesQcExceptional");//绫诲悕
+ lst.Add(_toGuid);//寮傚父鎶ュ憡涓婚敭
+ lst.Add("tab1");//鍏跺畠
+ ToUpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = lst });
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3