From 4fcc278c745fe6801c82622e34b2ce2cb150a44c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 十二月 2024 13:23:29 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs | 4
DevApp/Gs.DevApp/bin/Debug/FastReport.dll | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 4
DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 4
DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 1
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 123 ++++++++++----------
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 4
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 21 ++-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 4
47 files changed, 155 insertions(+), 148 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index f884df9..ad0e015 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -726,7 +726,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1219, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -746,7 +746,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1219, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index a046f08..310451f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -540,7 +540,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(928, 424);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -560,7 +560,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(928, 424);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
index 07214f3..9afd480 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.Designer.cs
@@ -289,7 +289,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1137, 384);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -309,7 +309,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1137, 384);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
index 5d80141..b1d3ed4 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDaaDirectOut.Designer.cs
@@ -200,7 +200,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 83bf456..001d907 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -620,7 +620,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(936, 369);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -640,7 +640,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(936, 369);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 021720b..29b3e74 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -935,7 +935,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1158, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -955,7 +955,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1158, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
index 4f2d437..acfaa28 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -424,7 +424,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(912, 357);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -444,7 +444,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(912, 357);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index d4ca926..fba6798 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -576,7 +576,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(970, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -596,7 +596,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(970, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index 28bf000..8fef8ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -296,7 +296,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1281, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// gcMain
//
@@ -507,7 +507,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1281, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 1c2a0f9..b7da860 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -723,7 +723,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1001, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -743,7 +743,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1001, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index c72c41e..dc9154c 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -616,7 +616,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(990, 510);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -636,7 +636,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(990, 510);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 3126b9e..4047dce 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -196,6 +196,7 @@
_itm.Name = _dy2["guid"].ToString();
_itm.Style = ElementStyle.Item;
_itm.Text = _dy2["name"].ToString();
+ wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
_itm.Appearance.Normal.Font =
new Font("Tahoma", 10F);
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index 36fcda3..c749a11 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -332,7 +332,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -353,7 +353,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 5a9bb2d..a516b15 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1239,7 +1239,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1260,7 +1260,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// xtraTabControl2
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 7897d29..6a153a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -742,7 +742,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// gcMain
//
@@ -1214,7 +1214,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// xtraTabControl2
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index 67368ce..81c58d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -463,7 +463,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1213, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -483,7 +483,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1213, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index e9a9808..ddaa274 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -1230,7 +1230,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1251,7 +1251,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 128aa6e..11017ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -887,7 +887,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -908,7 +908,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 76e34e5..540d87e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -332,7 +332,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -353,7 +353,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
index bb10c87..977ff2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesInvItemMoves.Designer.cs
@@ -1660,7 +1660,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1681,7 +1681,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
index a2646f4..9e41cf4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQt.Designer.cs
@@ -1110,7 +1110,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1131,7 +1131,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
index 6c715a5..423e163 100644
--- a/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QiTa/Frm_MesItemQtrk.Designer.cs
@@ -1044,7 +1044,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1065,7 +1065,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 1d0aebf..e958bd3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -281,7 +281,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(947, 548);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -301,7 +301,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(947, 548);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index 814ea0f..aa4a239 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -315,7 +315,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -335,7 +335,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index ccec719..3eddd70 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -99,7 +99,7 @@
this.xtraTabPage1.Controls.Add(this.tlMenu);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1072, 584);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
index 4e86a2d..0bd5ad1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
@@ -102,7 +102,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1189, 528);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// gcMain
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 38a6ee9..fda0720 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -431,7 +431,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -451,7 +451,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
index bb32f25..48d8d88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
@@ -111,7 +111,7 @@
this.xtraTabPage1.Controls.Add(this.tlMenu);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(792, 475);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// tlMenu
//
@@ -203,7 +203,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(792, 475);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 3d0ee65..d98d12a 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -103,7 +103,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1235, 629);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// gcMain
//
@@ -234,7 +234,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1235, 629);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index b1fa771..9c29774 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -354,7 +354,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(736, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -374,7 +374,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
index 0f6246b..4537ff6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
@@ -1432,7 +1432,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1453,7 +1453,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index b99f06a..ef2f532 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -1246,7 +1246,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1267,7 +1267,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 5032438..c5bd0be 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -2549,7 +2549,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 708);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -2570,7 +2570,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 708);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 99569ae..64ca3f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -1049,7 +1049,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1070,7 +1070,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 174984e..256654e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -973,7 +973,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -994,7 +994,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index be6c42b..c7320dc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -498,7 +498,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -519,7 +519,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index 0033c13..6ddf9f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -1004,7 +1004,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1025,7 +1025,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index e1c3599..edf242f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,16 +29,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- 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.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 editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,15 +59,15 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
this.lb_paperBillNo = new DevExpress.XtraEditors.LabelControl();
@@ -135,8 +135,8 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -444,48 +444,6 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Width = 100;
//
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 80;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 19;
- this.gvMxDel.Width = 80;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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);
- //
- // gvMxTui
- //
- this.gvMxTui.Caption = "鎿嶄綔";
- this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gvMxTui.MinWidth = 80;
- this.gvMxTui.Name = "gvMxTui";
- this.gvMxTui.Visible = true;
- this.gvMxTui.VisibleIndex = 18;
- this.gvMxTui.Width = 94;
- //
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
- editorButtonImageOptions5.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, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
- //
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栧彿";
@@ -539,6 +497,48 @@
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 16;
this.gridColumn7.Width = 94;
+ //
+ // gvMxTui
+ //
+ this.gvMxTui.Caption = "鎿嶄綔";
+ this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvMxTui.MinWidth = 80;
+ this.gvMxTui.Name = "gvMxTui";
+ this.gvMxTui.Visible = true;
+ this.gvMxTui.VisibleIndex = 18;
+ this.gvMxTui.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 80;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 19;
+ this.gvMxDel.Width = 80;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
//
// lb_fType
//
@@ -747,9 +747,10 @@
// gridColumn2
//
this.gridColumn2.Caption = "鍏ュ簱";
- this.gridColumn2.FieldName = "status";
+ this.gridColumn2.FieldName = "ckStatus";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.UnboundDataType = typeof(bool);
this.gridColumn2.Visible = true;
this.gridColumn2.Width = 50;
//
@@ -1023,7 +1024,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1231, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1044,7 +1045,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1231, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
@@ -1261,8 +1262,8 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index f0a9354..4ebc6a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -40,10 +40,6 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
- gvMx1.ValidatingEditor += (sender, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
- };
//璁剧疆缁勭粐
this.txt_receiveOrgId.EditChanged += (s, e) =>
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
index 5a40b79..3e6c885 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
@@ -1649,7 +1649,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1346, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1670,7 +1670,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1346, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
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 1e78592..14d5602 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -2437,7 +2437,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -2458,7 +2458,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
index 9c601ed..9cf62af 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
@@ -872,7 +872,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -893,7 +893,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 5c38254..8778db2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -1509,7 +1509,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1363, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -1530,7 +1530,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1363, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index de8f29d..73cc569 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -14,6 +14,7 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.RichEdit.Export;
+using DevExpress.XtraBars.Customization;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
@@ -21,6 +22,7 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraTab;
using DevExpress.XtraTreeList;
+using DevExpress.XtraWaitForm;
using Gs.DevApp.Entity;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -105,7 +107,10 @@
/// <returns></returns>
public static string HttpPost(string url, string meth, string param)
{
- DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎷煎懡鍔犺浇涓紝璇风◢鍚�..." + meth, "鍙嬫儏鎻愮ず");
+ string _caption = "鎷煎懡鍔犺浇涓紝璇风◢鍚�...";
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm(_caption + meth, "鍙嬫儏鎻愮ず");
+ wdf.BackColor = System.Drawing.Color.LightSkyBlue;
+ wdf.Padding = new Padding(15);
HttpWebRequest request = null;
StreamWriter requestStream = null;
WebResponse response = null;
@@ -123,23 +128,27 @@
request.Timeout = 15000;
request.AllowAutoRedirect = false;
request.ServicePoint.Expect100Continue = false;
- wdf.SetCaption("鍔犺浇杩涘害锛�10/100锛�");
+ wdf.SetCaption(_caption+"锛�10/100锛�" + meth);
HttpRequestCachePolicy noCachePolicy = new HttpRequestCachePolicy(HttpRequestCacheLevel.NoCacheNoStore);
request.CachePolicy = noCachePolicy;
- wdf.SetCaption("鍔犺浇杩涘害锛�20/100锛�");
+ wdf.SetCaption(_caption + "锛�20/100锛�" + meth);
requestStream = new StreamWriter(request.GetRequestStream());
requestStream.Write(param);
requestStream.Close();
+ wdf.SetCaption(_caption + "30/100锛�" + meth);
response = request.GetResponse();
+ wdf.SetCaption(_caption + "锛�40/100锛�");
if (response != null)
{
+ wdf.SetCaption(_caption + "锛�50/100锛�" + meth);
var reader = new StreamReader(response.GetResponseStream(),
Encoding.UTF8);
responseStr = reader.ReadToEnd();
//File.WriteAllText(Server.MapPath("~/") + @"\test.txt", responseStr);
reader.Close();
+ wdf.SetCaption(_caption + "锛�60/100锛�" + meth);
}
- wdf.SetCaption("鍔犺浇杩涘害锛�80/100锛�");
+ wdf.SetCaption(_caption + "锛�80/100锛�" + meth);
}
catch (Exception ex)
{
@@ -153,7 +162,7 @@
requestStream = null;
response = null;
}
- wdf.SetCaption("鍔犺浇杩涘害锛�90/100锛�");
+ wdf.SetCaption(_caption + "锛�90/100锛�");
wdf.Close();
return responseStr;
}
@@ -203,7 +212,7 @@
var dt = new DataTable();
foreach (GridColumn col in gv.Columns)
{
- if (col.UnboundDataType == typeof(bool))
+ if (col.UnboundDataType == typeof(System.Boolean))
dt.Columns.Add(col.FieldName, typeof(System.Boolean));
else
{
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll
new file mode 100644
index 0000000..1ed0d59
--- /dev/null
+++ b/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll
Binary files differ
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll
new file mode 100644
index 0000000..b64b4e2
--- /dev/null
+++ b/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll
Binary files differ
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.dll
new file mode 100644
index 0000000..e5e41c0
--- /dev/null
+++ b/DevApp/Gs.DevApp/bin/Debug/FastReport.dll
Binary files differ
--
Gitblit v1.9.3