From c4187f9a3321d9ff62579f87dedf66bf8151690d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 四月 2025 11:01:35 +0800
Subject: [PATCH] 加班
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 299 +++++++++++++++++++++++++++++------------------------------
1 files changed, 147 insertions(+), 152 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 4bc0234..5c79944 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -1,7 +1,3 @@
-using DevExpress.RichEdit.Export;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -10,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -32,8 +27,9 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "shChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -46,54 +42,44 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //txt_pba013.EditChanged += (s, e) =>
- //{
- // string workGuid = this.txt_pba013.GetGuid();
- // _getListJybz(workGuid);
- //};
////閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
- //btnSelect.Click += (s, e) =>
- //{
- // if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
- // {
- // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
- // return;
- // }
- // var frm = new SelectWompba(this.txt_pba013.Text);
- // //璧嬪�肩粰鏄庣粏琛�
- // frm.UpdateParent += (ss, ee) =>
- // {
- // try
- // {
- // var lst = new List<string>();
- // lst = ee.StringList;
- // var _obj = lst;
- // var strReturn = UtilityHelper.HttpPost("",
- // "WompbaManager/SelectPbaToView",
- // JsonConvert.SerializeObject(_obj));
- // var dt = UtilityHelper.ReturnToList(strReturn);
- // DataTable _newTable = dt.rtnData;
- // DataTable _oldTable = (DataTable)gcMx1.DataSource;
- // DataRow[] sourceRows = _newTable.Select();
- // for (int i = 0; i < sourceRows.Length; i++)
- // {
- // _oldTable.ImportRow(sourceRows[i]);
- // }
- // gcMx1.BindingContext = new BindingContext();
- // gcMx1.DataSource = _oldTable;
- // gcMx1.ForceInitialize();
- // }
- // catch (Exception ex)
- // {
- // MessageBox.Show(ex.Message);
- // }
- // };
- // frm.ShowDialog();
- //};
+ btnSelect.Click += (s, e) =>
+ {
+ var frm = new SelectWwPc("");
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ var _obj = lst;
+ var strReturn = UtilityHelper.HttpPost("",
+ "WWPCManager/SelectFormTo",
+ JsonConvert.SerializeObject(_obj));
+ var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _oldTable;
+ gcMx1.ForceInitialize();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -114,7 +100,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();
}
@@ -125,12 +114,8 @@
/// <param name="e"></param>
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ _filterList = e.FilterList;
+ getPageList(1);
}
/// <summary>
/// 瀹℃牳浜嬩欢
@@ -139,7 +124,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- _toolCk(1, "EditModelSubmit");
+ _toolCk(1);
}
/// <summary>
@@ -150,7 +135,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- _toolCk(0, "EditModelSubmitFSH");
+ _toolCk(0);
}
/// <summary>
@@ -194,9 +179,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);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -217,14 +203,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>
@@ -244,7 +231,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
/// <summary>
/// 鏂板浜嬩欢
@@ -255,7 +242,9 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gvList);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
@@ -266,25 +255,18 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //string workId = txt_pba013.GetId();
- //if (string.IsNullOrEmpty(workId.Trim()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
- // txt_pba013.Focus();
- // return;
- //}
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // bz = txt_pba009.Text.Trim(),
- // cjId = workId,
- // list = new List<dynamic>(),
- //};
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ bz = "",
+ list = new List<dynamic>(),
+ };
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
- MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏄庣粏锛�");
return;
}
for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -292,13 +274,7 @@
var row = gvMx1.GetDataRow(i);
if (row != null)
{
- Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- //string _LineId = row["daa015"].ToString();
- //if (string.IsNullOrEmpty(_LineId))
- //{
- // MsgHelper.ShowError("浜х嚎缂栫爜涓嶈兘涓虹┖锛�");
- // return;
- //}
+ Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
string _Pcsl = row["daa008"].ToString();
if (string.IsNullOrEmpty(_Pcsl))
{
@@ -311,64 +287,38 @@
MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒");
return;
}
- //string _prepareTime = row["prepareTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("棰勮澶囨枡鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- //string _planPersonnel = row["planPersonnel"].ToString();
- //if (string.IsNullOrEmpty(_planPersonnel))
- //{
- // MsgHelper.ShowError("璁″垝浜烘暟锛�");
- // return;
- //}
- //string _changeLinetime = row["changeLinetime"].ToString();
- //if (string.IsNullOrEmpty(_changeLinetime))
- //{
- // MsgHelper.ShowError("鎹㈢嚎鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
string _mesEndProd = row["mesEndProd"].ToString();
if (string.IsNullOrEmpty(_mesEndProd))
{
MsgHelper.ShowError("棰勮瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�");
return;
}
- //string _restTime = row["restTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("浼戞伅鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- //_obj.list.Add(new
- //{
- // Guid = _guid,
- // AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
- // LineId = row["daa015"].ToString(),//浜х嚎id
- // Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- // Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
- // Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
- // Bz = row["daa009"].ToString(),//澶囨敞
- // Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
- // Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
- // Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
- //});
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["rwdGuid"].ToString()),//鐩稿綋浜巆aaGuid
+ Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
+ Bz = row["remark"].ToString(),//澶囨敞
+ Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
+ Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
+ });
}
}
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<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
- //}
+ 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.outGuid;
+ txt_hNo.Text = _rtn.rtnData.outNo;
+ toolBarMenu1.isSetBtn = true;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
+ }
}
catch (Exception ex)
{
@@ -394,15 +344,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -447,7 +398,7 @@
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);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -460,6 +411,8 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -476,12 +429,11 @@
}
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private void _toolCk(int _inFieldValue, string _mth)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -511,16 +463,19 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + _mth,
+ _webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "shChk", "shBy", "shTime", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -529,5 +484,45 @@
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["id"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),
+ mxGuid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3