From b7b06604c4057163332b4017e02fe38bb40f51e4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 十二月 2024 21:46:00 +0800
Subject: [PATCH] 修改了初始化
---
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs | 64 +++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 54 +-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 1
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 46 ++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 1
DevApp/Gs.DevApp/UserControl/UcPageBar.cs | 6
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 240 +++-----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs | 43 +-
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 12
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 1
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs | 1
DevApp/Gs.DevApp/UserControl/SelectWompba.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.resx | 289 ++++++++---------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.cs | 96 +++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 1
73 files changed, 408 insertions(+), 509 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index a09cee9..f884df9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -736,7 +736,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1219, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index 6f493e3..a046f08 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -550,7 +550,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(928, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
index 76495c6..07214f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
@@ -299,7 +299,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1137, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
index 538bebc..f018069 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -306,7 +306,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
index 5daf99f..5d80141 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
@@ -285,7 +285,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 224649c..83bf456 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -630,7 +630,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(936, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index 443d578..987c733 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -127,7 +127,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 3269df6..021720b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -945,7 +945,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1158, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
index 1dd9290..4f2d437 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -434,7 +434,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(912, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 92acf4d..d4ca926 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -586,7 +586,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(970, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index e8c281f..28bf000 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -496,7 +496,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1281, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 456feae..1c2a0f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -733,7 +733,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1001, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index a4f8942..c72c41e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -626,7 +626,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(990, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index aabdbf1..36fcda3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -342,7 +342,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 76edb6b..984913a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -238,7 +238,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 7f0da1b..5a9bb2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1249,7 +1249,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1342, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index d71d3e9..3f6032d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -476,7 +476,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 2d17891..7897d29 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -1203,7 +1203,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1342, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index aa03801..de0f55b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -405,7 +405,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index 901b977..168506b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -516,7 +516,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index a3cfde8..f35e8d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -1240,7 +1240,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index a6ef595..68a88f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -376,7 +376,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 47bdccd..128aa6e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -897,7 +897,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1127, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index f0e49c9..76e34e5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -342,7 +342,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index ef8533e..6cabf3f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -236,7 +236,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
index b1fe01e..bb10c87 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2moveOk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -95,6 +95,7 @@
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ts = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -154,7 +155,6 @@
this.txt_fromDepotsId = new Gs.DevApp.UserControl.UcLookCk();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -824,10 +824,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -969,7 +969,7 @@
this.gvMx1qd007.FieldName = "quantity";
this.gvMx1qd007.MinWidth = 50;
this.gvMx1qd007.Name = "gvMx1qd007";
- this.gvMx1qd007.Tag = "query_a.qd007";
+ this.gvMx1qd007.Tag = "yz_quantity_0";
this.gvMx1qd007.Visible = true;
this.gvMx1qd007.VisibleIndex = 7;
this.gvMx1qd007.Width = 94;
@@ -982,10 +982,20 @@
this.gvMx1qd008.FieldName = "quantityCkok";
this.gvMx1qd008.MinWidth = 50;
this.gvMx1qd008.Name = "gvMx1qd008";
- this.gvMx1qd008.Tag = "query_a.qd008";
+ this.gvMx1qd008.Tag = "";
this.gvMx1qd008.Visible = true;
this.gvMx1qd008.VisibleIndex = 8;
this.gvMx1qd008.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "宸茶皟鎷ㄦ暟閲�";
+ this.gridColumn2.FieldName = "quantityOk";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 94;
//
// gvMx1qd009
//
@@ -1660,7 +1670,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
@@ -1750,16 +1759,6 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "宸茶皟鎷ㄦ暟閲�";
- this.gridColumn2.FieldName = "quantityOk";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
- this.gridColumn2.Width = 94;
//
// Frm_MesInvItemMoves
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
index 62a02cf..4e83ef5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.cs
@@ -1,6 +1,4 @@
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -47,6 +45,12 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
+
+ gvMx1.ValidatingEditor += (sender, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
+ };
+
var _obj = new
{
currentPage = 1,
@@ -68,6 +72,8 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
@@ -225,16 +231,56 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ string _fromDepotsId = txt_fromDepotsId.GetId();
+ string _invDepotsId = txt_invDepotsId.GetId();
+ if (string.IsNullOrEmpty(_fromDepotsId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鍙戞枡浠撲笉鑳戒负绌猴紒");
+ txt_fromDepotsId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_invDepotsId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鏀舵枡浠撲笉鑳戒负绌猴紒");
+ txt_invDepotsId.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ inFromDepotsId = _fromDepotsId,//鍙戞枡浠�
+ inInvDepotsId = _invDepotsId,//鏀舵枡浠�
+ inBz = txt_remark.Text.Trim(),//澶囨敞
+ list = new List<dynamic>(),
};
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ if (gvMx1.DataRowCount <= 0)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ return;
+ }
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ //string _msl = row["quantity"].ToString();
+ //if (string.IsNullOrEmpty(_msl))
+ //{
+ // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ // return;
+ //}
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ ItemId = (row["itemId"].ToString()),
+ Sqsl = (row["quantity"].ToString()),
+ Bz = (row["remark"].ToString()),
+ });
+ }
+ }
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
@@ -349,9 +395,9 @@
{
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
- gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
- gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
- gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
+ gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"]);
+ gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"]);
+ gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"]);
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
@@ -394,6 +440,6 @@
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
index c3a9562..a2646f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
@@ -1120,7 +1120,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
index c4bf800..6c715a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
@@ -1054,7 +1054,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 9e43522..95fc7fe 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -282,7 +282,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(947, 38);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 2dff202..2e53977 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -284,7 +284,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index e7b8c82..814ea0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -325,7 +325,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 061fbcd..e1f2047 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -231,7 +231,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 3f03abc..2cc3b18 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -437,7 +437,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 504e213..9134931 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -102,7 +102,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index da4edb5..3d0ee65 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -142,7 +142,7 @@
this.roleName.MinWidth = 25;
this.roleName.Name = "roleName";
this.roleName.OptionsColumn.AllowEdit = false;
- this.roleName.Tag = "query_a.role_Name";
+ this.roleName.Tag = "query_role_Name";
this.roleName.Visible = true;
this.roleName.VisibleIndex = 0;
this.roleName.Width = 94;
@@ -154,7 +154,7 @@
this.rolRemark.MinWidth = 25;
this.rolRemark.Name = "rolRemark";
this.rolRemark.OptionsColumn.AllowEdit = false;
- this.rolRemark.Tag = "query_a.role_Remark";
+ this.rolRemark.Tag = "query_role_Remark";
this.rolRemark.Visible = true;
this.rolRemark.VisibleIndex = 1;
this.rolRemark.Width = 94;
@@ -166,7 +166,7 @@
this.status.MinWidth = 25;
this.status.Name = "status";
this.status.OptionsColumn.AllowEdit = false;
- this.status.Tag = "query_a.is_Status";
+ this.status.Tag = "query_is_Status";
this.status.Visible = true;
this.status.VisibleIndex = 2;
this.status.Width = 94;
@@ -178,6 +178,7 @@
this.roleCreateBy.MinWidth = 25;
this.roleCreateBy.Name = "roleCreateBy";
this.roleCreateBy.OptionsColumn.AllowEdit = false;
+ this.roleCreateBy.Tag = "query_create_by";
this.roleCreateBy.Visible = true;
this.roleCreateBy.VisibleIndex = 3;
this.roleCreateBy.Width = 94;
@@ -189,7 +190,7 @@
this.createDate.MinWidth = 25;
this.createDate.Name = "createDate";
this.createDate.OptionsColumn.AllowEdit = false;
- this.createDate.Tag = "query_a.create_Time";
+ this.createDate.Tag = "query_create_Time";
this.createDate.Visible = true;
this.createDate.VisibleIndex = 4;
this.createDate.Width = 94;
@@ -223,7 +224,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 0;
this.pageBar1.Size = new System.Drawing.Size(1235, 40);
this.pageBar1.TabIndex = 6;
this.pageBar1.TotalPages = 0;
@@ -233,7 +233,7 @@
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(933, 629);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1235, 629);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
// panel1
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index d7b7b2b..6a6c765 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -1,12 +1,11 @@
锘縰sing System;
using System.Collections.Generic;
-using System.Drawing;
+using System.Data;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base;
using Gs.DevApp.Entity;
-using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -17,7 +16,6 @@
{
private StringBuilder _actionLst = new StringBuilder();
private List<FilterEntity> _filterList = new List<FilterEntity>();
-
public Role()
{
InitializeComponent();
@@ -29,25 +27,16 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- //gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- 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);
- };
}
-
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -68,7 +57,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -78,6 +67,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
@@ -91,7 +83,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -113,15 +105,14 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1,"", 2);
+ lbGuid, txt_roleName, gridView1, "roleName");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName +
- "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
return;
var lst = new List<string>();
lst.Add(rowGuid);
@@ -134,7 +125,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -152,8 +143,19 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -236,77 +238,48 @@
}
/// <summary>
- /// 鏉冮檺璁剧疆浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- //private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
- //{
- // string rowGuid, rowName;
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- // lbGuid, txt_roleName, gridView1);
- // if (string.IsNullOrEmpty(rowGuid))
- // {
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- // }
-
- // if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾璁剧疆鏉冮檺鍚楋紵"))
- // return;
- // _actionLst = new StringBuilder();
- // TraverseTreeViewNodes(trv.Nodes);
- // var _obj = new
- // {
- // roleGuid = rowGuid,
- // actionLst = _actionLst.ToString()
- // };
- // try
- // {
- // var strJson = UtilityHelper.HttpPost("",
- // "Role/SetRoleMenuAction",
- // JsonConvert.SerializeObject(_obj));
- // var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- // MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //}
-
- /// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "CREATE_TIME",
+ UcLoading _loading = new UcLoading();
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
- UtilityHelper.HttpPost("", "Role/GetListPage", json);
+ await UtilityHelper.HttpPostAsync("", "Role/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Close();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -344,103 +317,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- //private void getTree(string roleGuid)
- //{
- // trv.Nodes.Clear();
- // var imageList = new ImageList();
- // imageList.Images.Add("icon0", Resources.publicfix_32x32);
- // imageList.Images.Add("icon1", Resources.addfooter_32x32);
- // imageList.Images.Add("icon2", Resources.listmultilevel_16x16);
- // imageList.Images.Add("icon3", Resources.addcalculatedfield_16x16);
- // trv.ImageList = imageList;
- // var _obj = new
- // {
- // roleGuid //涓诲缓
- // };
- // try
- // {
- // var strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole",
- // JsonConvert.SerializeObject(_obj));
- // var dd = UtilityHelper.ReturnToTablePage(strReturn);
- // var dt = dd.rtnData.list;
- // var drGrp = dt.Select("upGuid='' or upGuid is null");
- // foreach (var _dy in drGrp)
- // {
- // var _orgGuid = _dy["guid"] + "&";
- // var node = new TreeNode(); //瀹氫箟缁撶偣
- // node.Text = _dy["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node.Name = _dy["guid"].ToString();
- // node.ImageIndex = 0;
- // node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
- // var drItem = dt.Select("upGuid='" + _dy["guid"] +
- // "' and orgGuid='" + _dy["guid"] +
- // "'");
- // foreach (var _dy2 in drItem)
- // {
- // var node22 = new TreeNode(); //瀹氫箟缁撶偣
- // node22.Text = _dy2["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node22.Name = _orgGuid + _dy2["guid"];
- // node22.ImageIndex = 1;
- // node22.Checked = _dy2["isCk"].ToString() == "1"
- // ? true
- // : false;
- // var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
- // "' and orgGuid='" +
- // _dy["guid"] + "'");
- // foreach (var _dy3 in drItem33)
- // {
- // var node33 = new TreeNode(); //瀹氫箟缁撶偣
- // node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node33.Name = _orgGuid + _dy3["guid"];
- // node33.ImageIndex = 2;
- // node33.Checked = _dy3["isCk"].ToString() == "1"
- // ? true
- // : false;
- // var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
- // "' and orgGuid='" + _dy["guid"] + "'");
- // foreach (var _dy4 in drItem44)
- // {
- // var node44 = new TreeNode(); //瀹氫箟缁撶偣
- // node44.Text = _dy4["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node44.Name = _orgGuid + _dy4["guid"];
- // node44.ImageIndex = 3;
- // node44.Checked = _dy4["isCk"].ToString() == "1"
- // ? true
- // : false;
- // node33.Nodes.Add(node44);
- // }
-
- // node22.Nodes.Add(node33);
- // }
-
- // node22.Expand();
- // node.Nodes.Add(node22);
- // }
-
- // node.Expand();
- // trv.Nodes.Add(node);
- // }
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //}
-
- //private void Trv_AfterCheck(object sender, TreeViewEventArgs e)
- //{
- // try
- // {
- // trv.AfterCheck -= Trv_AfterCheck;
- // UtilityHelper.TreeViewCheck(e);
- // trv.AfterCheck += Trv_AfterCheck;
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.ShowError(ex.Message);
- // }
- //}
// 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐�
private void TraverseTreeViewNodes(TreeNodeCollection nodes)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index e534ed2..b1fa771 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -31,17 +31,17 @@
{
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(User));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -111,7 +111,7 @@
this.isLocked.MinWidth = 25;
this.isLocked.Name = "isLocked";
this.isLocked.OptionsColumn.AllowEdit = false;
- this.isLocked.Tag = "query_a.IS_STATUS";
+ this.isLocked.Tag = "query_IS_STATUS";
this.isLocked.Visible = true;
this.isLocked.VisibleIndex = 7;
this.isLocked.Width = 94;
@@ -184,7 +184,7 @@
this.account.MinWidth = 25;
this.account.Name = "account";
this.account.OptionsColumn.AllowEdit = false;
- this.account.Tag = "query_a.ACCOUNT";
+ this.account.Tag = "query_ACCOUNT";
this.account.Visible = true;
this.account.VisibleIndex = 0;
this.account.Width = 94;
@@ -198,7 +198,7 @@
this.userName.MinWidth = 25;
this.userName.Name = "userName";
this.userName.OptionsColumn.AllowEdit = false;
- this.userName.Tag = "query_a.USER_NAME";
+ this.userName.Tag = "query_USER_NAME";
this.userName.Visible = true;
this.userName.VisibleIndex = 1;
this.userName.Width = 94;
@@ -212,7 +212,7 @@
this.tel.MinWidth = 25;
this.tel.Name = "tel";
this.tel.OptionsColumn.AllowEdit = false;
- this.tel.Tag = "query_a.tel";
+ this.tel.Tag = "query_tel";
this.tel.Visible = true;
this.tel.VisibleIndex = 2;
this.tel.Width = 94;
@@ -226,7 +226,7 @@
this.email.MinWidth = 25;
this.email.Name = "email";
this.email.OptionsColumn.AllowEdit = false;
- this.email.Tag = "query_a.email";
+ this.email.Tag = "query_email";
this.email.Visible = true;
this.email.VisibleIndex = 3;
this.email.Width = 94;
@@ -238,6 +238,7 @@
this.colCreateBy.MinWidth = 25;
this.colCreateBy.Name = "colCreateBy";
this.colCreateBy.OptionsColumn.AllowEdit = false;
+ this.colCreateBy.Tag = "query_CREATE_BY";
this.colCreateBy.Visible = true;
this.colCreateBy.VisibleIndex = 4;
this.colCreateBy.Width = 94;
@@ -251,7 +252,7 @@
this.createTime.MinWidth = 25;
this.createTime.Name = "createTime";
this.createTime.OptionsColumn.AllowEdit = false;
- this.createTime.Tag = "query_a.CREATE_TIME";
+ this.createTime.Tag = "query_CREATE_TIME";
this.createTime.Visible = true;
this.createTime.VisibleIndex = 5;
this.createTime.Width = 94;
@@ -265,7 +266,7 @@
this.lastLoginTime.MinWidth = 25;
this.lastLoginTime.Name = "lastLoginTime";
this.lastLoginTime.OptionsColumn.AllowEdit = false;
- this.lastLoginTime.Tag = "query_a.LASTLOGIN_TIME";
+ this.lastLoginTime.Tag = "query_LASTLOGIN_TIME";
this.lastLoginTime.Visible = true;
this.lastLoginTime.VisibleIndex = 6;
this.lastLoginTime.Width = 94;
@@ -279,7 +280,7 @@
this.loginCounter.MinWidth = 25;
this.loginCounter.Name = "loginCounter";
this.loginCounter.OptionsColumn.AllowEdit = false;
- this.loginCounter.Tag = "query_a.LOGIN_COUNTER";
+ this.loginCounter.Tag = "query_LOGIN_COUNTER";
this.loginCounter.Visible = true;
this.loginCounter.VisibleIndex = 8;
this.loginCounter.Width = 94;
@@ -301,12 +302,12 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- serializableAppearanceObject17.Font = new System.Drawing.Font("Tahoma", 10F);
- serializableAppearanceObject17.Options.UseFont = true;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.user_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ serializableAppearanceObject1.Font = new System.Drawing.Font("Tahoma", 10F);
+ serializableAppearanceObject1.Options.UseFont = true;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁剧疆瑙掕壊", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁剧疆瑙掕壊", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -327,10 +328,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶇疆瀵嗙爜", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶇疆瀵嗙爜", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -363,7 +364,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(736, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 48ca2c6..2c9557a 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -1,7 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
@@ -15,7 +17,6 @@
public partial class User : XtraForm
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
-
public User()
{
InitializeComponent();
@@ -27,24 +28,16 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- 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);
- };
}
-
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
@@ -65,7 +58,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -75,6 +68,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
@@ -88,7 +84,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -130,7 +126,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -148,8 +144,19 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -250,35 +257,45 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "CREATE_TIME",
+ UcLoading _loading = new UcLoading();
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "CREATE_TIME",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
- UtilityHelper.HttpPost("", "User/GetListPage", json);
+ await UtilityHelper.HttpPostAsync("", "User/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Close();
}
private void getModel(string strGuid, bool isEdit, int tabIdx)
@@ -288,7 +305,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.resx b/DevApp/Gs.DevApp/DevFrm/User/User.resx
index 7069005..7678899 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.resx
@@ -1,157 +1,140 @@
锘�<?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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <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>
- <assembly alias="System.Drawing"
- name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
- <data name="editorButtonImageOptions6.Image"
- type="System.Drawing.Bitmap, System.Drawing"
- mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACp0RVh0VGl0
- bGUAQ29udGFjdDtDYXJkO0luZm87RGV0YWlsO1BlcnNvbjtFZGl04bGTWAAAAtlJREFUOE+Nk1lIVFEA
- ho8zruPWhhuaCEOUtuiDPVQQiqQlWJIvBuJajU1oqWOSRZpS2KiVWpKKS5baJI6mKZYb2l4oyNhEVlQ+
- iKIzOrmM4/J3zrFQi6AL38Occ77v3nPPHbLqMvoHgj9gYwQAh11G5Up1R0X9B/wPZXUDndQRrAmwiYXF
- pb9ZWGH+F2V175klXB0QlCnVfNHEDwPKFe04l1EKWXoJSqufQqOb4+NaimF+EXdqVMwybrvkTZqSdvGA
- sOiBitYXMTahR1JaMeJTCznJ6cUY1cxAqzNgXKfH9MwcmrsGWcCCYvQw1n05kF/Zx+saurCmvgenU25x
- qpTd0E7OYXxSj+GRSQy05oHeGRWx7jm/IyxgLC95C72BBuhi9eAwYmX5nF7VN/pUsxga1qCvMRefGkKw
- uPQFqqrDyA5yyaWuGQuYZBQ8x6x+AaPjs2hu7+WyJCkPypbXGPw6gncNcnysC+ay/nMculO3Q+7nwLZi
- wwPns7swNTuP9OwqHD97AzGU6PhcREiz0HBbBrUiiMtTKgk6ZFvRId8P6U7bQuqKWMA0IfMJdNPzVLrO
- xai4HIRJrkBx8wwG7gdyWfsmEm3xYrRm7EX0NutS6m2gsA+LmJ26+BgTUwZ6XHPQUEbHtHihyER/mT+X
- RzpD0Sp1Q2PqboSJLcup48jkcCf+CohJRGJtW1RyPSIp4Qm1KChUoEcewOWhpmC0SFxRl+iFY24iJjtR
- zEPtTUmY43KAHYUJhR0Lw85j38mKR0VXMT30Cs0nXFEj9UCIi3klnWN3NqUIjm40ITGbzVf+FIxn1/bQ
- OWLn6Zf4vf9lK+5mpeCyjxhHHM3u0XEHilBd7EvUxT4kaJ2QxIst1wba0rxZwGG9sy9s7LyHLWy3VNtb
- iYLp2CYmB9oICeOQtYAcpFzYYb020CTzZAG2MbZPZwp70+y3UYCVgPhbCsgBCovEiUUkw8uW/ASLygoB
- zKvoygAAAABJRU5ErkJggg==
- </value>
+ <!--
+ 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>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACp0RVh0VGl0
+ bGUAQ29udGFjdDtDYXJkO0luZm87RGV0YWlsO1BlcnNvbjtFZGl04bGTWAAAAtlJREFUOE+Nk1lIVFEA
+ ho8zruPWhhuaCEOUtuiDPVQQiqQlWJIvBuJajU1oqWOSRZpS2KiVWpKKS5baJI6mKZYb2l4oyNhEVlQ+
+ iKIzOrmM4/J3zrFQi6AL38Occ77v3nPPHbLqMvoHgj9gYwQAh11G5Up1R0X9B/wPZXUDndQRrAmwiYXF
+ pb9ZWGH+F2V175klXB0QlCnVfNHEDwPKFe04l1EKWXoJSqufQqOb4+NaimF+EXdqVMwybrvkTZqSdvGA
+ sOiBitYXMTahR1JaMeJTCznJ6cUY1cxAqzNgXKfH9MwcmrsGWcCCYvQw1n05kF/Zx+saurCmvgenU25x
+ qpTd0E7OYXxSj+GRSQy05oHeGRWx7jm/IyxgLC95C72BBuhi9eAwYmX5nF7VN/pUsxga1qCvMRefGkKw
+ uPQFqqrDyA5yyaWuGQuYZBQ8x6x+AaPjs2hu7+WyJCkPypbXGPw6gncNcnysC+ay/nMculO3Q+7nwLZi
+ wwPns7swNTuP9OwqHD97AzGU6PhcREiz0HBbBrUiiMtTKgk6ZFvRId8P6U7bQuqKWMA0IfMJdNPzVLrO
+ xai4HIRJrkBx8wwG7gdyWfsmEm3xYrRm7EX0NutS6m2gsA+LmJ26+BgTUwZ6XHPQUEbHtHihyER/mT+X
+ RzpD0Sp1Q2PqboSJLcup48jkcCf+CohJRGJtW1RyPSIp4Qm1KChUoEcewOWhpmC0SFxRl+iFY24iJjtR
+ zEPtTUmY43KAHYUJhR0Lw85j38mKR0VXMT30Cs0nXFEj9UCIi3klnWN3NqUIjm40ITGbzVf+FIxn1/bQ
+ OWLn6Zf4vf9lK+5mpeCyjxhHHM3u0XEHilBd7EvUxT4kaJ2QxIst1wba0rxZwGG9sy9s7LyHLWy3VNtb
+ iYLp2CYmB9oICeOQtYAcpFzYYb020CTzZAG2MbZPZwp70+y3UYCVgPhbCsgBCovEiUUkw8uW/ASLygoB
+ zKvoygAAAABJRU5ErkJggg==
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
index 1904d7b..0f6246b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
@@ -1442,7 +1442,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 38);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 8544232..b99f06a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -1256,7 +1256,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 21e4754..5032438 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -2559,7 +2559,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index a793ede..99569ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -1059,7 +1059,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 51accba..174984e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -983,7 +983,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1344, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index c31c377..f21a0e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -196,7 +196,7 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
+
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index ba9129a..be6c42b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -508,7 +508,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index 7418591..457e53b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -1012,7 +1012,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index b2f145c..4ec0a75 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -267,7 +267,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index fd80ef3..59cdf02 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1036,7 +1036,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1231, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 1088f1c..e191a1a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -503,7 +503,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
index 959f287..5a40b79 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
@@ -1659,7 +1659,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1346, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
index 73f6ae7..28105a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
@@ -221,7 +221,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
index 50e1983..1e78592 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -2447,7 +2447,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
index 6c2f6c7..96564cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.cs
@@ -314,7 +314,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
index cbb84e5..9c601ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
@@ -882,7 +882,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
index df00bdf..a9cfecf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
@@ -356,7 +356,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index c02818e..ed75800 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -1220,7 +1220,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1363, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 6a4fe21..02a3a08 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -128,7 +128,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 84c5dbd..25fbc03 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1249,7 +1249,7 @@
if (string.IsNullOrEmpty(filter.FilterString))
continue;
// fiList.Add(new FilterEntity("b.FNumber", "浣跨敤缁勭粐", " like ", "鍖呭惈", "%" + filter.Value + "%"));
- string[] ddd = filter.FilterString.Replace("Contains","").Replace("(","").Replace(")","").Replace("'", "").Replace("'", "").Split(',');
+ string[] ddd = filter.FilterString.Replace("Contains", "").Replace("(", "").Replace(")", "").Replace("'", "").Replace("'", "").Split(',');
//Contains([fSubsidiary], '005')
fiList.Add(getFilterEntityWord(col.Tag.ToString(), col.Caption.Trim(), ddd[1].Trim()));
}
@@ -1272,7 +1272,7 @@
_sbSqlWhere.Append(" and org.FNumber " + itm.fileOper + "'" + itm.fileValue + "'");
else
{
- _sbSqlWhere.Append(" and org.NAME " + itm.fileOper + "'" + itm.fileValue.Trim() + "'");
+ _sbSqlWhere.Append(" and org.NAME " + itm.fileOper + "'" + itm.fileValue.Trim() + "'");
}
}
else
@@ -1292,12 +1292,31 @@
column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
column.OptionsFilter.ImmediateUpdateAutoFilter = false;
column.OptionsColumn.AllowEdit = false;
- if (column.Tag==null || column.Tag.ToString().Length <= 0)
+ if (column.Tag == null || column.Tag.ToString().Length <= 0)
column.OptionsFilter.AllowAutoFilter = false;
}
gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
gridView1.OptionsFilter.AllowFilterEditor = false;
gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
+ gridView1.OptionsCustomization.AllowFilter = false;
+ gridView1.OptionsFind.ShowSearchNavButtons = false;
+ gridView1.OptionsView.ShowAutoFilterRow = true;
+ gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
+ gridView1.CustomDrawEmptyForeground += (s, e) =>
+ {
+ 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);
+ };
+
}
#endregion
@@ -1307,6 +1326,27 @@
Regex regex = new Regex("^[0-9]+$");
return regex.IsMatch(str);
}
+
+
+ public static void SetValidatingEditor(object sender, BaseContainerValidateEditorEventArgs e)
+ {
+ //yz_quantity_0
+ GridView view = sender as GridView;
+ if (view.FocusedColumn.Tag != null && view.FocusedColumn.Tag.ToString().StartsWith("yz_"))
+ {
+ string[] _ary = view.FocusedColumn.Tag.ToString().Split('_');
+ if (_ary.Length > 2)
+ {
+ if (_ary[2] == "0")
+ {
+ double price = 0; if (!Double.TryParse(e.Value as String, out price))
+ { e.Valid = false; e.ErrorText = "璇疯緭鍏ユ纭殑鏁板瓧."; }
+ return;
+ }
+ }
+ }
+ }
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 21e1142..ebba005 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -366,7 +366,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(984, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 62603cd..12bfd8f 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -96,7 +96,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
index c1d77a3..f07bff0 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
@@ -69,7 +69,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(984, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
index 7d15573..90cd424 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
@@ -98,7 +98,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
index 6d0974e..3ef3e55 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
@@ -213,7 +213,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(984, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
index 52dc2ad..cc7f795 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
@@ -90,7 +90,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs
index 998b11f..87d75c2 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.Designer.cs
@@ -335,7 +335,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(984, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs b/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs
index f239bf6..ade95b0 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWomdaahb.cs
@@ -93,7 +93,7 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
+
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
index 0fffc8c..cc58db7 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -71,7 +71,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(984, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
index 01542e2..f62360a 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
@@ -93,7 +93,7 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
+
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
index 8e4c3d7..30f4005 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
@@ -130,7 +130,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(933, 47);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 87eb360..1c43803 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -68,7 +68,6 @@
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
pageBar1.setTxt();
}
else
diff --git a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
index e0c5213..27932ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcPageBar.cs
@@ -22,10 +22,10 @@
private void cbxRowCount_SelectedIndexChanged(object sender,
EventArgs e)
{
- RowsCount = Convert.ToInt32(cbxRowCount.Text);
+ int _RowsCount = Convert.ToInt32(cbxRowCount.Text);
CurrentPage = 1;
if (PagerEvent != null)
- if (RecordCount > 0 && RowsCount>0)
+ if (_RowsCount > 0 && _RowsCount > 0)
BtnEvents(sender, e);
}
@@ -132,7 +132,7 @@
/// <summary>
/// 姣忛〉鏉℃暟
/// </summary>
- public int RowsCount { get; set; }
+ public int RowsCount { get { return int.Parse(this.cbxRowCount.Text); } }
int _RecordCount;
--
Gitblit v1.9.3