From 9478ddf3051e83eb9a5889ff90688b34dd0f96a5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 16 十二月 2024 14:42:55 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 221 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 155 insertions(+), 66 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index b853d73..6b97c13 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -1,3 +1,5 @@
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -9,6 +11,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -29,29 +32,23 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ txt_pba013.EditChanged += (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);
+ string workGuid = this.txt_pba013.GetGuid();
+ txt_pba016.getSuppler(workGuid);
+ _getListJybz(workGuid);
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- if (string.IsNullOrEmpty(this.txt_pba013.Text))
+ if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
return;
}
var frm = new SelectWompba(this.txt_pba013.Text);
@@ -86,7 +83,12 @@
frm.ShowDialog();
};
}
-
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -105,7 +107,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -125,15 +127,19 @@
/// <param name="e"></param>
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
- _filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
}
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -147,14 +153,14 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾瀹℃牳鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -164,14 +170,14 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -180,7 +186,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -193,14 +199,14 @@
return;
}
//MsgHelper.Warning(rowGuid);
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "DeApprove",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -209,7 +215,7 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
else
{
@@ -220,7 +226,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -242,7 +248,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_hNo, gridView1,"hNo");
+ lbGuid, txt_hNo, gridView1, "hNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -264,7 +270,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -285,7 +291,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
/// 淇敼浜嬩欢
@@ -325,19 +340,32 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
- // return;
- //}
- var _sb = new StringBuilder();
+ string workId = txt_pba013.GetId();
+ if (string.IsNullOrEmpty(workId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
+ txt_pba013.Focus();
+ return;
+ }
+ string lineId = txt_pba016.GetId();
+ if (string.IsNullOrEmpty(lineId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
+ txt_pba016.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_pba015.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璁″垝浜烘暟涓嶈兘涓虹┖锛�");
+ txt_pba015.Focus();
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
bz = txt_pba009.Text.Trim(),
- cjId = 1,
- cxId = 1,
+ cjId = workId,
+ cxId = lineId,
jhrs = txt_pba015.Text.Trim(),
list = new List<dynamic>(),
};
@@ -354,21 +382,33 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- //string _msl = row["quantity"].ToString();
- //if (string.IsNullOrEmpty(_msl))
- //{
- // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
- // return;
- //}
+ string _LineId = row["daa015"].ToString();
+ if (string.IsNullOrEmpty(_LineId))
+ {
+ MsgHelper.ShowError("浜х嚎涓嶈兘涓虹┖锛�");
+ return;
+ }
+ string _Pcsl = row["daa008"].ToString();
+ if (string.IsNullOrEmpty(_LineId))
+ {
+ MsgHelper.ShowError("鎺掍骇鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ string _Yjkgsj = row["mesStartProd"].ToString();
+ if (string.IsNullOrEmpty(_LineId))
+ {
+ MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
- AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
+ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
LineId = int.Parse(row["daa015"].ToString()),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- Jhrs = row["daa015"].ToString(),//璁″垝浜烘暟
+ Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
- Bz = row["daa009"].ToString(),//鎹㈢嚎鏃堕棿
+ Bz = row["daa009"].ToString(),//澶囨敞
Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
});
@@ -397,31 +437,33 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- 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());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ var 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;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -432,6 +474,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -522,5 +565,51 @@
}
}
}
+
+ private void _getListJybz(string workGuid)
+ {
+ if (string.IsNullOrEmpty(workGuid))
+ return;
+ var _obj = new
+ {
+ guid = workGuid //涓诲缓
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "SysDepartmentManager/GetModel", json);
+ var _job = JObject.Parse(strReturn);
+ var array = new JArray();
+ var d = _job["rtnData"]["list"];
+ foreach (var a in d) array.Add(a);
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ ComboBoxEdit comboBox = sender as ComboBoxEdit;
+ if (comboBox != null)
+ {
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
+ string _val = _itm.Value.ToString();
+ string _txt = _itm.Text.ToString();
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.SetRowCellValue(dataIndex, "daa015LineName", _txt);
+ gvMx1.SetRowCellValue(dataIndex, "daa015", _val);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3