From ec02022018c44e794fa53e40daa96321daaae4fc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 02 六月 2025 15:21:30 +0800
Subject: [PATCH] 清理
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 193 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 158 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index aaa8a03..63938b9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -16,6 +16,11 @@
{
string _webServiceName = "MesItemQtManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucKh = "";//棰嗘枡瀹㈡埛
+ string _ucBm = "";//棰嗘枡閮ㄩ棬
+ string _ucCk = "";//鍙戞枡浠撳簱
+ string _ucHzlx = "";//璐т富绫诲瀷
+ string _ucHz = "";//璐т富
public Frm_MesItemQt()
{
InitializeComponent();
@@ -29,36 +34,44 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
+ toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
+ toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
+ toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
+ toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
+ toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡锛�
+ //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛�
txt_qt023.EditChanged += (s, e) =>
{
string _orgId = txt_qt023.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_qt008.getSuppler(_orgId);
ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ txt_qt008.getSuppler(_orgId, _ucCk);
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
var json = JsonConvert.SerializeObject(_obj);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- "MesItemsManager/GetListSelect", json);
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
@@ -68,21 +81,21 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- //閫夋嫨璐т富绫诲瀷锛堝彉璐т富锛�
//閫夋嫨棰嗙敤缁勭粐
txt_qt024.EditChanged += (s, e) =>
{
string _orgId = txt_qt024.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_qt013.getSuppler(_orgId);
- txt_qt009.getSuppler(_orgId);
+ txt_qt013.getSuppler(_orgId, _ucKh);
+ txt_qt009.getSuppler(_orgId, _ucBm);
};
-
+
}
+
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);
}
@@ -118,7 +131,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();
}
@@ -159,13 +172,17 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 0)
@@ -174,6 +191,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -220,13 +238,14 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ ucLookHuoZhu1.Enabled = true;
}
}
/// <summary>
@@ -240,8 +259,9 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ ucLookHuoZhu1.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -322,6 +342,7 @@
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -361,7 +382,10 @@
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);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ ucLookHuoZhu1.Enabled = false;
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -377,7 +401,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -387,16 +411,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();
- gridView1.BestFitColumns();
+ 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;//褰撳墠椤�
@@ -413,6 +437,11 @@
}
}
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -434,10 +463,21 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucKh = dy.qt013;
+ _ucBm = dy.qt009;
+ _ucCk = dy.qt008;
+ _ucHzlx = dy.qt025;
+ _ucHz = dy.qt018;
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);
+ _ucKh = "";
+ _ucBm = "";
+ _ucCk = "";
+ _ucHzlx = "";
+ _ucHz = "";
+ ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -451,6 +491,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -489,6 +530,68 @@
}
/// <summary>
+ /// 鍞悗瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouChkClick(object sender, EventArgs e)
+ {
+ _toolCk(20);
+ }
+
+ /// <summary>
+ /// 鍞悗鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(21);
+ }
+
+ /// <summary>
+ /// 璐㈠姟瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e)
+ {
+ _toolCk(30);
+ }
+ /// <summary>
+ /// 璐㈠姟鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(31);
+ }
+ /// <summary>
+ /// 閲囪喘瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e)
+ {
+ _toolCk(40);
+ }
+ /// <summary>
+ /// 閲囪喘鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+
+ private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(41);
+ }
+
+ /// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
@@ -503,6 +606,24 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 20:
+ strMsg = "鍞悗瀹℃牳";
+ break;
+ case 21:
+ strMsg = "鍞悗鍙嶅鏍�";
+ break;
+ case 30:
+ strMsg = "璐㈠姟瀹℃牳";
+ break;
+ case 31:
+ strMsg = "璐㈠姟鍙嶅鏍�";
+ break;
+ case 40:
+ strMsg = "閲囪喘瀹℃牳";
+ break;
+ case 41:
+ strMsg = "閲囪喘鍙嶅鏍�";
+ break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -514,7 +635,6 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
var _obj = new
{
guid = rowGuid,
@@ -535,15 +655,13 @@
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- Form parentForm = this.FindForm();
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
@@ -553,8 +671,13 @@
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
}
-
+ /// <summary>
+ /// 鍒犻櫎鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
--
Gitblit v1.9.3