From 770c671fb4ad9bf3691b1250bc10f9c4087edf97 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 十二月 2024 08:25:13 +0800
Subject: [PATCH] 修改进度条
---
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 12
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 13
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs | 24
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | 10
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 24
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/UCUpFile.cs | 8
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 22
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 12
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs | 12
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 17
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs | 24
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs | 12
DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs | 4
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs | 24
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 28 +-
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 12
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.cs | 12
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 92 +++---
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 19 +
/dev/null | 120 ---------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 32 +-
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 12
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 12
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 12
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 20
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 12
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs | 32 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 12
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 33 +-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 20
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 12
38 files changed, 320 insertions(+), 429 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
index 5f98028..be37b22 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -27,10 +27,10 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e)
@@ -112,15 +112,14 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -148,7 +147,6 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index b9623da..02735cc 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -27,10 +27,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -110,17 +110,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
-
- UcLoading _loading = new UcLoading();
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -149,7 +147,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
index f36f7d5..6f18069 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.cs
@@ -42,10 +42,10 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -213,16 +213,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "b.item_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -251,7 +251,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
///
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 66dffe0..c5b8c9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -41,10 +41,10 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -122,16 +122,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -160,7 +160,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
index e70624f..7b95154 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -40,10 +40,10 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -122,16 +122,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "position_name",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -160,7 +160,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 63e33dc..9cd9857 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -39,10 +39,10 @@
};
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -120,16 +120,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "fname", "asc", "",
_sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -158,7 +158,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 320eea2..3f08e9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -42,10 +42,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -131,17 +131,17 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -170,7 +170,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 74d6a69..3bf2e5c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -31,10 +31,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
private void GridView1_CustomDrawRowIndicator(object sender,
@@ -120,16 +120,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -158,7 +158,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index c98fb83..ff7e185 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -28,10 +28,10 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -117,16 +117,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -155,7 +155,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index acb2682..95f52b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -517,6 +517,7 @@
this.Name = "FrmMain";
this.NavigationControl = this.acrd;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.fluentDesignFormContainer1.ResumeLayout(false);
this.fluentDesignFormContainer1.PerformLayout();
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c00981d..3126b9e 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -15,10 +15,8 @@
using Gs.DevApp.DevFrm.User;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using static DevExpress.XtraReports.Design.XtraTabControl;
namespace Gs.DevApp.DevFrm
{
@@ -144,9 +142,9 @@
getTree();
}
- private async void getTree()
+ private void getTree()
{
- UcLoading _loading = new UcLoading();
+
toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
@@ -155,11 +153,11 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎷煎懡鍔犺浇涓紝璇风◢鍚�......", "鍙嬫儏鎻愮ず");
var _job = JObject.Parse(strJson);
var rtnCode = _job["rtnCode"].ToString();
- _loading.Stop();
if (int.Parse(rtnCode) > 0)
{
acrd.Clear();
@@ -176,6 +174,7 @@
int gdx = 0, idx = 0;
foreach (var _dy in drGrp)
{
+ wdf.SetCaption("鍔犺浇杩涘害:" + _dy["name"].ToString());
var _grp = acrd.AddGroup();
_grp.ImageOptions.Image =
UtilityHelper.GetImgFromResource(
@@ -221,13 +220,15 @@
{
MsgHelper.ShowError("鎻愮ず锛氬垵濮嬪寲澶辫触锛岃鑱旂郴绠＄悊鍛橈紒");
}
+ wdf.SetCaption("鍔犺浇杩涘害锛�90/100锛�");
+ wdf.Close();
}
catch (Exception ex)
{
- _loading.Stop();
+
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 3f6032d..1311a03 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -273,7 +273,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -287,14 +287,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);
@@ -311,7 +311,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -452,9 +452,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage, int pageSize)
{
- UcLoading _loading = new UcLoading();
+
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
foreach (FilterEntity itm in _filterList)
{
@@ -464,7 +464,7 @@
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -487,9 +487,9 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
- private async void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -497,14 +497,14 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = strGuid,//涓诲缓
};
try
{
- string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -546,7 +546,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
@@ -602,9 +602,9 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private async void getList12(string guid5)
+ private void getList12(string guid5)
{
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -612,7 +612,7 @@
};
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -623,7 +623,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index de0f55b..afcddfe 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -381,9 +381,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage, int pageSize)
{
- UcLoading _loading = new UcLoading();
+
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
foreach (FilterEntity itm in _filterList)
{
@@ -393,7 +393,7 @@
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -416,9 +416,9 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
- private async void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -426,14 +426,14 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = strGuid,//涓诲缓
};
try
{
- string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -469,7 +469,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
/// 閫夐」鍗″垏鎹�
@@ -523,9 +523,9 @@
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
/// <param name="guid5"></param>
- private async void getList12(string guid5)
+ private void getList12(string guid5)
{
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -533,7 +533,7 @@
};
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
@@ -544,7 +544,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index bbd6949..abcf490 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -52,10 +52,10 @@
};
_setIno();
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
private void _setIno()
@@ -267,15 +267,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -303,7 +303,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
///
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 42a9f5a..f1ffbdd 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -59,10 +59,10 @@
//鍒濆鍖栫墿鏂欓�夋嫨鍜屽悇绉嶄笅鎷�
_setIno();
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -353,17 +353,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
"a.create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd =
UtilityHelper.ReturnToTablePage(strReturn);
@@ -393,7 +392,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Close();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
index 4e83ef5..833f112 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
@@ -74,10 +74,10 @@
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -304,15 +304,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -340,7 +340,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
index cfdc3e8..3e2902e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.cs
@@ -80,10 +80,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -326,15 +326,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -362,7 +362,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -420,7 +420,7 @@
/// </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)
{
_toolCk(1);
}
@@ -431,7 +431,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)
{
_toolCk(0);
}
@@ -440,7 +440,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -462,7 +462,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -470,7 +470,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -487,7 +487,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
index 198909b..7b99b4e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.cs
@@ -87,10 +87,10 @@
}
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -329,15 +329,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -365,7 +365,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -472,7 +472,7 @@
/// </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)
{
_toolCk(1);
}
@@ -483,7 +483,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)
{
_toolCk(0);
}
@@ -492,7 +492,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -515,7 +515,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -523,7 +523,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -540,7 +540,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
index 8803af2..c48a70f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyCode.cs
@@ -680,7 +680,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
+ private async void BtnUp_Click(object sender, EventArgs e)
{
var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
var address = WebApiUrl + "Upload/UploadFile";
@@ -689,7 +689,7 @@
await UploadFileAsync(apiUrl, filePath);
}
- private async Task UploadFileAsync(string url, string filePath)
+ private async Task UploadFileAsync(string url, string filePath)
{
using (var httpClient = new HttpClient())
using (var form = new MultipartFormDataContent())
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 21dad7b..8856938 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -25,10 +25,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -88,9 +88,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
@@ -98,7 +98,7 @@
try
{
var strReturn =
- await UtilityHelper.HttpPostAsync("", "SysLog/GetListPage", json);
+ UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -121,7 +121,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
}
- _loading.Close();
+
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 6a6c765..80858c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -31,10 +31,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -241,9 +241,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"desc", "", _sbSqlWhere.ToString());
@@ -251,7 +251,7 @@
try
{
var strReturn =
- await UtilityHelper.HttpPostAsync("", "Role/GetListPage", json);
+ UtilityHelper.HttpPost("", "Role/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -279,7 +279,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Close();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 2c9557a..1279dbd 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -32,10 +32,10 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -257,9 +257,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"asc", "", _sbSqlWhere.ToString());
@@ -267,7 +267,7 @@
try
{
var strReturn =
- await UtilityHelper.HttpPostAsync("", "User/GetListPage", json);
+ UtilityHelper.HttpPost("", "User/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -295,7 +295,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Close();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
index 43f55cb..ef174cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
@@ -93,10 +93,10 @@
txt_daahb015.getSuppler(workGuid);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -158,7 +158,7 @@
/// </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)
{
_toolCk(1);
}
@@ -169,7 +169,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)
{
_toolCk(0);
}
@@ -350,15 +350,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -386,7 +386,7 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -501,7 +501,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -523,7 +523,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -531,7 +531,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -548,7 +548,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 853b6ab..0aee61a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -43,10 +43,10 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
@@ -141,7 +141,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private async void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
{
}
@@ -151,7 +151,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private async void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -165,14 +165,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);
@@ -189,7 +189,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -197,15 +197,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -234,7 +234,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index e02d587..000d432 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -57,10 +57,10 @@
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -107,7 +107,7 @@
_filterList = e.FilterList;
getPageList(1);
}
- private async void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
_toolCk(1);
}
@@ -278,9 +278,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -314,7 +314,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
@@ -371,7 +371,7 @@
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
- private async void _toolCk(int _inFieldValue)
+ private void _toolCk(int _inFieldValue)
{
string strMsg = "";
switch (_inFieldValue)
@@ -412,7 +412,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = rowGuid,
@@ -420,7 +420,7 @@
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -437,7 +437,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 72a76f5..acdfa43 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -98,10 +98,10 @@
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -154,7 +154,7 @@
/// </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;
@@ -168,14 +168,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);
@@ -192,7 +192,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -201,7 +201,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;
@@ -214,14 +214,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);
@@ -241,7 +241,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -440,15 +440,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -477,7 +477,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index 623a04e..aafef22 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -48,10 +48,10 @@
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -176,15 +176,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -212,7 +212,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 37cf780..f0a9354 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -8,6 +8,7 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraWaitForm;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -105,10 +106,10 @@
};
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -178,7 +179,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -192,14 +193,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 + "EditModelSubmitF",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -216,7 +217,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -224,7 +225,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -238,14 +239,13 @@
}
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);
@@ -262,7 +262,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -464,16 +463,15 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -502,7 +500,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -608,7 +605,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
@@ -626,11 +623,11 @@
}
var lst = new List<string>();
lst.Add(mxGuid);
- UcLoading _loading = new UcLoading();
+
var _obj = lst;
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "TuiMx",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -644,7 +641,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
index 28105a3..bf49012 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
@@ -88,7 +88,7 @@
/// </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;
@@ -101,14 +101,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 + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -128,7 +128,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -137,7 +137,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;
@@ -150,14 +150,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);
@@ -177,7 +177,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
/// <summary>
@@ -197,9 +197,9 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage, int pageSize)
{
- UcLoading _loading = new UcLoading();
+
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
foreach (FilterEntity itm in _filterList)
{
@@ -209,7 +209,7 @@
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -232,9 +232,9 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
- private async void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -242,14 +242,14 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = strGuid,//涓诲缓
};
try
{
- string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -301,7 +301,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index c73d317..fe9d21d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -30,10 +30,10 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
}
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- await Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -111,16 +111,16 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage)
+ private void getPageList(int curPage)
{
- UcLoading _loading = new UcLoading();
+
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = await UtilityHelper.HttpPostAsync("",
+ var strReturn = UtilityHelper.HttpPost("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
@@ -149,9 +149,9 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
- private async void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
@@ -160,14 +160,14 @@
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- UcLoading _loading = new UcLoading();
+
var _obj = new
{
guid = strGuid //涓诲缓
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -205,7 +205,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- _loading.Stop();
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 0230a99..f17072f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -582,12 +582,6 @@
<Compile Include="UserControl\UcComBox.Designer.cs">
<DependentUpon>UcComBox.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\UcLoading.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\UcLoading.Designer.cs">
- <DependentUpon>UcLoading.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\UcLookCk.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -861,9 +855,6 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcComBox.resx">
<DependentUpon>UcComBox.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcLoading.resx">
- <DependentUpon>UcLoading.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookCk.resx">
<DependentUpon>UcLookCk.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 940cf3b..d6f72fd 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -42,6 +42,7 @@
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
this.simpleButton1.TabIndex = 3;
this.simpleButton1.Text = "simpleButton1";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
// ucLookSupplier1
//
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index 2a0a628..0daa8ba 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -15,6 +15,7 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using static DevExpress.XtraPrinting.Native.ExportOptionsPropertiesNames;
namespace Gs.DevApp.TestForm
{
@@ -28,6 +29,22 @@
}
-
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ Random random = new Random();
+ int randomValue = 0;
+ //杩涘害鏉�
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎻愮ず", "姝ｅ湪瀵煎叆鏁版嵁......");
+
+ randomValue = (int)random.Next(1, 38);
+ wdf.SetCaption("鎵ц杩涘害锛�" + randomValue + "%锛�");
+
+ randomValue = (int)random.Next(randomValue, 80);
+
+ wdf.SetCaption("鎵ц杩涘害锛�" + randomValue + "%锛�");
+
+ wdf.Close();
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index ff0354f..b9d75dd 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -26,6 +26,7 @@
using Newtonsoft.Json.Linq;
using static System.Windows.Forms.Control;
+
namespace Gs.DevApp.ToolBox
{
/// <summary>
@@ -64,35 +65,35 @@
/// <param name="meth">鏂规硶鍚嶇О</param>
/// <param name="param">鍙傛暟</param>
/// <returns></returns>
- public static async Task<string> HttpPostAsync(string url, string meth, string param)
- {
- if (string.IsNullOrEmpty(url))
- url = WebApiUrl;
- url += meth;
- var request = (HttpWebRequest)WebRequest.Create(url);
- request.Method = "POST";
- request.ContentType = "application/json";
- request.Headers.Add("token", GetBasicAuthTicket());
- request.Accept = "*/*";
- request.Timeout = 15000;
- request.AllowAutoRedirect = false;
- request.ServicePoint.Expect100Continue = false;
- HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
- request.CachePolicy = noCachePolicy;
- using (Stream requestStream = await request.GetRequestStreamAsync())
- {
- byte[] dataBytes = Encoding.UTF8.GetBytes(param);
- await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
- }
+ //public static async Task<string> HttpPostAsync(string url, string meth, string param)
+ //{
+ // if (string.IsNullOrEmpty(url))
+ // url = WebApiUrl;
+ // url += meth;
+ // var request = (HttpWebRequest)WebRequest.Create(url);
+ // request.Method = "POST";
+ // request.ContentType = "application/json";
+ // request.Headers.Add("token", GetBasicAuthTicket());
+ // request.Accept = "*/*";
+ // request.Timeout = 15000;
+ // request.AllowAutoRedirect = false;
+ // request.ServicePoint.Expect100Continue = false;
+ // HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
+ // request.CachePolicy = noCachePolicy;
+ // using (Stream requestStream = await request.GetRequestStreamAsync())
+ // {
+ // byte[] dataBytes = Encoding.UTF8.GetBytes(param);
+ // await requestStream.WriteAsync(dataBytes, 0, dataBytes.Length);
+ // }
- using (WebResponse response = await request.GetResponseAsync())
- {
- using (StreamReader reader = new StreamReader(response.GetResponseStream()))
- {
- return await reader.ReadToEndAsync();
- }
- }
- }
+ // using (WebResponse response = await request.GetResponseAsync())
+ // {
+ // using (StreamReader reader = new StreamReader(response.GetResponseStream()))
+ // {
+ // return await reader.ReadToEndAsync();
+ // }
+ // }
+ //}
/// <summary>
/// httpPost璁块棶鏈嶅姟
@@ -103,24 +104,28 @@
/// <returns></returns>
public static string HttpPost(string url, string meth, string param)
{
- if (string.IsNullOrEmpty(url))
- url = WebApiUrl;
- url += meth;
- var request = (HttpWebRequest)WebRequest.Create(url);
- request.Method = "POST";
- request.ContentType = "application/json";
- request.Headers.Add("token", GetBasicAuthTicket());
- request.Accept = "*/*";
- request.Timeout = 15000;
- request.AllowAutoRedirect = false;
- request.ServicePoint.Expect100Continue = false;
- HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
- request.CachePolicy = noCachePolicy;
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎷煎懡鍔犺浇涓紝璇风◢鍚�..."+ meth, "鍙嬫儏鎻愮ず");
+ HttpWebRequest request = null;
StreamWriter requestStream = null;
WebResponse response = null;
string responseStr = null;
try
{
+ if (string.IsNullOrEmpty(url))
+ url = WebApiUrl;
+ url += meth;
+ request = (HttpWebRequest)WebRequest.Create(url);
+ request.Method = "POST";
+ request.ContentType = "application/json";
+ request.Headers.Add("token", GetBasicAuthTicket());
+ request.Accept = "*/*";
+ request.Timeout = 15000;
+ request.AllowAutoRedirect = false;
+ request.ServicePoint.Expect100Continue = false;
+ wdf.SetCaption("鍔犺浇杩涘害锛�10/100锛�");
+ HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
+ request.CachePolicy = noCachePolicy;
+ wdf.SetCaption("鍔犺浇杩涘害锛�20/100锛�");
requestStream = new StreamWriter(request.GetRequestStream());
requestStream.Write(param);
requestStream.Close();
@@ -133,9 +138,11 @@
//File.WriteAllText(Server.MapPath("~/") + @"\test.txt", responseStr);
reader.Close();
}
+ wdf.SetCaption("鍔犺浇杩涘害锛�80/100锛�");
}
catch (Exception ex)
{
+ wdf.Close();
LogHelper.Debug(url, param + ":" + ex.Message);
throw ex;
}
@@ -145,7 +152,8 @@
requestStream = null;
response = null;
}
-
+ wdf.SetCaption("鍔犺浇杩涘害锛�90/100锛�");
+ wdf.Close();
return responseStr;
}
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
index beb75dc..5fd57ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
@@ -69,7 +69,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
+ private async void BtnUp_Click(object sender, EventArgs e)
{
var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
var address = WebApiUrl + "MesFile/UploadFile";
@@ -84,9 +84,9 @@
if (UpChanged != null) UpChanged(this, e);
}
- private async Task UploadFileAsync(string url, string filePath)
+ private async Task UploadFileAsync(string url, string filePath)
{
- UcLoading _loading = new UcLoading();
+
string _parentGuid = parentGuid;
using (var httpClient = new HttpClient())
try
@@ -112,7 +112,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
- _loading.Close();
+
}
#endregion
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs
deleted file mode 100644
index 90d9255..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLoading.Designer.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-锘縩amespace Gs.DevApp.UserControl
-{
- partial class UcLoading
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- this.lblCaption = new DevExpress.XtraEditors.LabelControl();
- this.lblMessage = new DevExpress.XtraEditors.LabelControl();
- this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
- this.lblContent = new DevExpress.XtraEditors.LabelControl();
- this.progressShow = new DevExpress.XtraEditors.ProgressBarControl();
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
- this.panelControl2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
- this.SuspendLayout();
- //
- // lblCaption
- //
- this.lblCaption.Location = new System.Drawing.Point(30, 12);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(48, 18);
- this.lblCaption.TabIndex = 0;
- this.lblCaption.Text = "Caption";
- //
- // lblMessage
- //
- this.lblMessage.Location = new System.Drawing.Point(30, 9);
- this.lblMessage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblMessage.Name = "lblMessage";
- this.lblMessage.Size = new System.Drawing.Size(58, 18);
- this.lblMessage.TabIndex = 2;
- this.lblMessage.Text = "Message";
- //
- // panelControl2
- //
- this.panelControl2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.panelControl2.Controls.Add(this.lblContent);
- this.panelControl2.Controls.Add(this.progressShow);
- this.panelControl2.Controls.Add(this.lblMessage);
- this.panelControl2.Location = new System.Drawing.Point(0, 49);
- this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(498, 107);
- this.panelControl2.TabIndex = 5;
- //
- // lblContent
- //
- this.lblContent.Location = new System.Drawing.Point(30, 40);
- this.lblContent.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.lblContent.Name = "lblContent";
- this.lblContent.Size = new System.Drawing.Size(51, 18);
- this.lblContent.TabIndex = 3;
- this.lblContent.Text = "Content";
- //
- // progressShow
- //
- this.progressShow.EditValue = 1;
- this.progressShow.Location = new System.Drawing.Point(30, 76);
- this.progressShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.progressShow.Name = "progressShow";
- this.progressShow.Properties.Appearance.BackColor = System.Drawing.Color.Transparent;
- this.progressShow.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
- this.progressShow.Properties.EndColor = System.Drawing.Color.Empty;
- this.progressShow.Properties.LookAndFeel.SkinName = "Blue";
- this.progressShow.Properties.LookAndFeel.UseDefaultLookAndFeel = false;
- this.progressShow.Properties.LookAndFeel.UseWindowsXPTheme = true;
- this.progressShow.Properties.ReadOnly = true;
- this.progressShow.Properties.ShowTitle = true;
- this.progressShow.Properties.StartColor = System.Drawing.Color.Empty;
- this.progressShow.Properties.Step = 1;
- this.progressShow.Size = new System.Drawing.Size(457, 19);
- this.progressShow.TabIndex = 4;
- //
- // panelControl1
- //
- this.panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D;
- this.panelControl1.Controls.Add(this.lblCaption);
- this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelControl1.Location = new System.Drawing.Point(0, 0);
- this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(498, 44);
- this.panelControl1.TabIndex = 0;
- //
- // UcLoading
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(498, 159);
- this.Controls.Add(this.panelControl2);
- this.Controls.Add(this.panelControl1);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.IconOptions.ShowIcon = false;
- this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "UcLoading";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "ShowDialogForm";
- this.TopMost = true;
- ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
- this.panelControl2.ResumeLayout(false);
- this.panelControl2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.progressShow.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
- this.panelControl1.PerformLayout();
- this.ResumeLayout(false);
-
- }
-
- #endregion
- private DevExpress.XtraEditors.LabelControl lblCaption;
- private DevExpress.XtraEditors.LabelControl lblMessage;
- private DevExpress.XtraEditors.ProgressBarControl progressShow;
- private DevExpress.XtraEditors.PanelControl panelControl2;
- private DevExpress.XtraEditors.LabelControl lblContent;
- private DevExpress.XtraEditors.PanelControl panelControl1;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.cs b/DevApp/Gs.DevApp/UserControl/UcLoading.cs
deleted file mode 100644
index 6df7e31..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLoading.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-锘縰sing DevExpress.Xpo.Logger;
-using DevExpress.XtraEditors;
-using DevExpress.XtraRichEdit.Import.Html;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
-
-namespace Gs.DevApp.UserControl
-{
- public partial class UcLoading : DevExpress.XtraEditors.XtraForm
- {
- private Timer timer;
- private int angle = 0;
-
- public UcLoading()
- {
- InitializeComponent();
- this.DoubleBuffered = true;
- timer = new Timer();
- timer.Interval = 1000 / 60; // 60甯�/绉�
- timer.Tick += Timer_Tick;
-
- progressShow.Properties.Minimum = 0;
- progressShow.Properties.Maximum = 100;
- progressShow.Properties.Step = 1;
-
- Show();
- Start();
- }
-
- protected override void OnPaint(PaintEventArgs e)
- {
- base.OnPaint(e);
- DrawLoadingCircle(e.Graphics);
- }
-
- private void DrawLoadingCircle(Graphics g)
- {
-
- lblCaption.Text = "鍙嬫儏鎻愮ず锛�";
- lblMessage.Text = "璇风◢鍊欙紝鎷煎懡鍔犺浇涓�......";
- lblContent.Text = "宸插姞杞� " + progressShow.EditValue.ToString() + "/100";
-
- progressShow.PerformStep();
- if (int.Parse(progressShow.EditValue.ToString()) > 95)
- progressShow.EditValue = 1;
- }
-
- private void Timer_Tick(object sender, EventArgs e)
- {
- angle = (angle + 30) % 360;
- this.Invalidate();
- }
-
- public void Start()
- {
- timer.Start();
- }
-
- public void Stop()
- {
- timer.Stop();
- this.Close();
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLoading.resx b/DevApp/Gs.DevApp/UserControl/UcLoading.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLoading.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 56e41c5..e3533db 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -37,7 +37,7 @@
if (EditChanged != null) EditChanged(this, e);
}
- private async void getSuppler()
+ private void getSuppler()
{
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 262a31e..7b54fb9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -313,7 +313,7 @@
//_ckService(1.ToString());
}
- private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
+ private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
{
if (string.IsNullOrEmpty(xlsInService))
{
--
Gitblit v1.9.3