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/BasicData/Frm_MesPosition.cs |  106 +++++++++++++++++++++++++++++------------------------
 1 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
index eb6383b..515c969 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -1,55 +1,59 @@
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.Drawing;
+using System.Text;
 using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
 
 namespace Gs.DevApp.DevFrm
 {
-    public partial class Frm_MesPosition  : DevExpress.XtraEditors.XtraForm
+    public partial class Frm_MesPosition : XtraForm
     {
-        string _webServiceName = "MesPositionManager/";
-        List<FilterEntity> _filterList = new List<FilterEntity>();
-        public Frm_MesPosition ()
+        private List<FilterEntity> _filterList = new List<FilterEntity>();
+        private readonly string _webServiceName = "MesPositionManager/";
+
+        public Frm_MesPosition()
         {
             InitializeComponent();
-            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            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(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
+                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);
             };
         }
 
         /// <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, e, "guid");
+            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>
@@ -57,19 +61,21 @@
         {
             getPageList(curPage, pageSize);
         }
+
         /// <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, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
+
         /// <summary>
-        /// 鏌ヨ鍥炶皟
+        ///     鏌ヨ鍥炶皟
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -80,7 +86,7 @@
         }
 
         /// <summary>
-        /// 鍒锋柊浜嬩欢
+        ///     鍒锋柊浜嬩欢
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -91,41 +97,41 @@
         }
 
         /// <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)
-            {
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
-            }
-            PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "position_name", "asc", "", _sbSqlWhere.ToString());
-            string json = JsonConvert.SerializeObject(pgq);
+            var _sbSqlWhere = new StringBuilder();
+            foreach (var itm in _filterList)
+                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
+                                   itm.fileValue + "'");
+            var pgq = new PageQueryModel(curPage, pageSize, "position_name",
+                "asc", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
             try
             {
-                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
-                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
-                DataTable dt = dd.rtnData.list;
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                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;//褰撳墠椤�
-                pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+                pageBar1.CurrentPage = curPage; //褰撳墠椤�
+                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
                 pageBar1.setTxt();
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
         /// <summary>
-        /// 
         /// </summary>
         /// <param name="strGuid">涓婚敭</param>
         /// <param name="isEdit">鏄惁鍙紪杈�</param>
@@ -134,31 +140,35 @@
         {
             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("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetModel",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
-                    dynamic dy = _rtn.rtnData;
+                    var dy = _rtn.rtnData;
                     lbGuid.Text = strGuid;
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
-
+                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
                 }
                 else
-                    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