From cefcc903f51610846fa313a3a35bca34e129c1fe Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 08:57:01 +0800
Subject: [PATCH] 代码清理以及格式化
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 216 ++++++++++++++++++++++++++----------------------------
1 files changed, 104 insertions(+), 112 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index ed2cff8..141c987 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -1,48 +1,49 @@
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using MES.Service.Modes;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Text;
using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm
{
- public partial class Frm_MesSysLookups : DevExpress.XtraEditors.XtraForm
+ public partial class Frm_MesSysLookups : XtraForm
{
- string _webServiceName = "MesSysLookupTypesManager/";
- List<FilterEntity> _filterList = new List<FilterEntity>();
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ private readonly string _webServiceName = "MesSysLookupTypesManager/";
public Frm_MesSysLookups()
{
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;
+ toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
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(
+ var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
+ var f = new Font("寰蒋闆呴粦", 16);
+ var 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);
@@ -50,21 +51,21 @@
}
/// <summary>
- /// 鍙屽嚮浜嬩欢
+ /// 鍙屽嚮浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
{
- string rowGuid =
- Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1,
+ var rowGuid =
+ UtilityHelper.GetCurrentDoubleRow(gridView1,
e, "guid");
if (!string.IsNullOrEmpty(rowGuid))
getModel(rowGuid, false, 999);
}
/// <summary>
- /// 鍒嗛〉浜嬩欢
+ /// 鍒嗛〉浜嬩欢
/// </summary>
/// <param name="curPage"></param>
/// <param name="pageSize"></param>
@@ -74,21 +75,21 @@
}
/// <summary>
- /// 鏌ヨ浜嬩欢
+ /// 鏌ヨ浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm =
- new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns,
+ var frm =
+ new ShowFilter(gridView1.Columns,
_filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
/// <summary>
- /// 鏌ヨ鍥炶皟
+ /// 鏌ヨ鍥炶皟
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -99,7 +100,7 @@
}
/// <summary>
- /// 鍙栨秷浜嬩欢
+ /// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -109,7 +110,7 @@
}
/// <summary>
- /// 鍒犻櫎浜嬩欢
+ /// 鍒犻櫎浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -120,38 +121,38 @@
lbGuid, txt_lookupTypeCode, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
+ var lst = new List<dynamic>();
lst.Add(rowGuid);
var _obj = lst;
try
{
- string strJson = UtilityHelper.HttpPost("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "DeleteModel",
JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn =
- ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -162,7 +163,7 @@
}
/// <summary>
- /// 淇敼浜嬩欢
+ /// 淇敼浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -173,7 +174,7 @@
lbGuid, txt_lookupTypeCode, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
@@ -181,7 +182,7 @@
}
/// <summary>
- /// 鏂板浜嬩欢
+ /// 鏂板浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -189,16 +190,16 @@
{
UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews =
- new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ var gridViews =
+ new List<GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true,
+ UtilityHelper.CleanValueByControl(panel1.Controls, true,
gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
- /// 淇濆瓨浜嬩欢
+ /// 淇濆瓨浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -207,33 +208,31 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_lookupTypeCode.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("绯荤粺蹇爜绫诲瀷缂栫爜涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("绯荤粺蹇爜绫诲瀷缂栫爜涓嶈兘涓虹┖锛�");
txt_lookupTypeCode.Focus();
return;
}
- List<MesSysLookups> lst = new List<MesSysLookups>();
- for (int i = 0; i < gvMx1.DataRowCount; i++)
+ var lst = new List<MesSysLookups>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
{
- DataRow row = gvMx1.GetDataRow(i);
+ var row = gvMx1.GetDataRow(i);
if (row != null)
- {
lst.Add(new MesSysLookups
{
- Guid = (row["Guid"].ToString().Length > 0
+ Guid = row["Guid"].ToString().Length > 0
? Guid.Parse(row["Guid"].ToString())
- : Guid.Empty),
+ : Guid.Empty,
LookupName = row["LookupName"].ToString(),
- LookupValue = row["LookupValue"].ToString(),
+ LookupValue = row["LookupValue"].ToString()
});
- }
}
- var _obj = new MesSysLookupTypes()
+ var _obj = new MesSysLookupTypes
{
- Guid = (lbGuid.Text.Trim().Length > 0
+ Guid = lbGuid.Text.Trim().Length > 0
? Guid.Parse(lbGuid.Text.Trim())
- : Guid.Empty),
+ : Guid.Empty,
LookupTypeCode = txt_lookupTypeCode.Text,
LookupTypeName = txt_lookupTypeName.Text,
list = lst
@@ -241,55 +240,52 @@
try
{
- string strJson = UtilityHelper.HttpPost("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn =
- ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls,
+ UtilityHelper.ChangeEnableByControl(panel1.Controls,
false);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- ///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- System.Text.StringBuilder _sbSqlWhere =
- new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
+ var _sbSqlWhere =
+ new StringBuilder();
+ foreach (var itm in _filterList)
_sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize,
+ var pgq = new PageQueryModel(curPage, pageSize,
"create_date", "asc", "", _sbSqlWhere.ToString());
- string json = JsonConvert.SerializeObject(pgq);
+ var json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
- ReturnModel<PageListModel> dd =
+ var dd =
UtilityHelper.ReturnToTablePage(strReturn);
- DataTable dt = dd.rtnData.list;
+ var dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages; //鎬婚〉
+ var dddd = dd.rtnData.pages; //鎬婚〉
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
@@ -298,7 +294,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -306,39 +302,36 @@
{
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
- guid = strGuid, //涓诲缓
+ guid = strGuid //涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn =
- ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- dynamic dy = _rtn.rtnData;
+ var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList =
- new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ var gvList =
+ new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy,
+ UtilityHelper.SetValueByObj(panel1.Controls, dy,
isEdit, gvList);
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
- {
- array.Add(a);
- }
+ var _job = JObject.Parse(strJson);
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- DataTable dt =
+ var dt =
JsonConvert.DeserializeObject<DataTable>(
array.ToString());
if (dt.Rows.Count > 0)
@@ -349,51 +342,50 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1,
+ UtilityHelper.SetDefaultTable(gcMx1,
gvMx1);
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
private void repositoryItemButtonEdit1_ButtonClick(object sender,
- DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ ButtonPressedEventArgs e)
{
- int rowhandle = gvMx1.FocusedRowHandle;
+ var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
- DataRow dr = gvMx1.GetDataRow(rowhandle);
- string mxGuid = dr["guid"].ToString();
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
- string strJson = "";
- List<string> lst = new List<string>();
+ var strJson = "";
+ var lst = new List<string>();
lst.Add(mxGuid);
try
{
strJson = UtilityHelper.HttpPost("",
_webServiceName + "DeleteModelMx",
JsonConvert.SerializeObject(lst));
- ReturnModel<dynamic> _rtn =
- ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- getModel(lbGuid.Text, true, 1);
- }
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3