Browse Source

中文方法修改

Hcsy 8 years ago
parent
commit
25fa4a7304
24 changed files with 52 additions and 52 deletions
  1. 1 1
      UAS-MES/FunctionCode/Make/Make_CheckNoRelpace.Designer.cs
  2. 1 1
      UAS-MES/FunctionCode/Make/Make_CheckNoRelpace.cs
  3. 3 3
      UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.Designer.cs
  4. 3 3
      UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs
  5. 2 2
      UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs
  6. 2 2
      UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs
  7. 1 1
      UAS-MES/FunctionCode/Make/Make_NewPallet.Designer.cs
  8. 1 1
      UAS-MES/FunctionCode/Make/Make_NewPallet.cs
  9. 4 4
      UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs
  10. 4 4
      UAS-MES/FunctionCode/Make/Make_PackageCollection.cs
  11. 4 4
      UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.Designer.cs
  12. 4 4
      UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs
  13. 2 2
      UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs
  14. 2 2
      UAS-MES/FunctionCode/Make/Make_PalletCollection.cs
  15. 2 2
      UAS-MES/FunctionCode/Make/Make_PositionStock.Designer.cs
  16. 2 2
      UAS-MES/FunctionCode/Make/Make_PositionStock.cs
  17. 1 1
      UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs
  18. 1 1
      UAS-MES/FunctionCode/Make/Make_Repair.cs
  19. 2 2
      UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.Designer.cs
  20. 2 2
      UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs
  21. 2 2
      UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs
  22. 2 2
      UAS-MES/FunctionCode/Query/Query_ExeProgress.cs
  23. 2 2
      UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.Designer.cs
  24. 2 2
      UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.cs

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_CheckNoRelpace.Designer.cs

@@ -191,7 +191,7 @@
             this.Name = "序列替换";
             this.Tag = "Make!CheckNoRelpace";
             this.Text = "序列替换";
-            this.Load += new System.EventHandler(this.序列替换_Load);
+            this.Load += new System.EventHandler(this.Make_CheckNoRelpace_Load);
             this.ResumeLayout(true);
             this.PerformLayout();
 

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_CheckNoRelpace.cs

@@ -19,7 +19,7 @@ namespace UAS_MES.Make
             InitializeComponent();
         }
 
-        private void 序列替换_Load(object sender, EventArgs e)
+        private void Make_CheckNoRelpace_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
         }

+ 3 - 3
UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.Designer.cs

@@ -403,9 +403,9 @@
             this.Name = "Make_ColorBoxLoadPrint";
             this.Tag = "Make!ColorBoxLoadPrint";
             this.Text = "s";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.标签打印_FormClosing);
-            this.Load += new System.EventHandler(this.标签打印_Load);
-            this.SizeChanged += new System.EventHandler(this.标签打印_SizeChanged);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_ColorBoxLoadPrint_FormClosing);
+            this.Load += new System.EventHandler(this.Make_ColorBoxLoadPrint_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_ColorBoxLoadPrint_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();

+ 3 - 3
UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -54,7 +54,7 @@ namespace UAS_MES.Make
             load.Checked = true;
         }
 
-        private void 标签打印_Load(object sender, EventArgs e)
+        private void Make_ColorBoxLoadPrint_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
             code.Focus();
@@ -277,7 +277,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 标签打印_SizeChanged(object sender, EventArgs e)
+        private void Make_ColorBoxLoadPrint_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }
@@ -302,7 +302,7 @@ namespace UAS_MES.Make
             BaseUtil.SetFormValue(Controls, dt);
         }
 
-        private void 标签打印_FormClosing(object sender, FormClosingEventArgs e)
+        private void Make_ColorBoxLoadPrint_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
         }

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -539,8 +539,8 @@
             this.Name = "Make_FeedingCollection";
             this.Tag = "Make!FeedingCollection";
             this.Text = "上料采集";
-            this.Load += new System.EventHandler(this.上料采集_Load);
-            this.SizeChanged += new System.EventHandler(this.上料采集_SizeChanged);
+            this.Load += new System.EventHandler(this.Make_FeedingCollection_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
             this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -62,7 +62,7 @@ namespace UAS_MES.Make
             InitializeComponent();
         }
 
-        private void 上料采集_Load(object sender, EventArgs e)
+        private void Make_FeedingCollection_Load(object sender, EventArgs e)
         {
             code.Focus();
             asc.controllInitializeSize(this);
@@ -92,7 +92,7 @@ namespace UAS_MES.Make
                 iflastsn.Checked = false;
         }
 
-        private void 上料采集_SizeChanged(object sender, EventArgs e)
+        private void Make_FeedingCollection_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_NewPallet.Designer.cs

@@ -154,7 +154,7 @@
             this.Name = "Make_NewPallet";
             this.Tag = "ShowDialogWindow";
             this.Text = "新增栈板";
-            this.Load += new System.EventHandler(this.新增栈板_Load);
+            this.Load += new System.EventHandler(this.Make_NewPallet_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
 

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -36,7 +36,7 @@ namespace UAS_MES.Make
             pa_outboxcode.MakeCode = MakeCode;
         }
 
-        private void 新增栈板_Load(object sender, EventArgs e)
+        private void Make_NewPallet_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
             pr_code.FormName = Name;

+ 4 - 4
UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -746,10 +746,10 @@
             this.Name = "Make_PackageCollection";
             this.Tag = "Make!PackageCollection";
             this.Text = "包装采集";
-            this.Activated += new System.EventHandler(this.包装采集_Activated);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.包装采集_FormClosing);
-            this.Load += new System.EventHandler(this.包装采集_Load);
-            this.SizeChanged += new System.EventHandler(this.包装采集_SizeChanged);
+            this.Activated += new System.EventHandler(this.PackCollection_Activated);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PackCollection_FormClosing);
+            this.Load += new System.EventHandler(this.PackCollection_Load);
+            this.SizeChanged += new System.EventHandler(this.PackCollection_SizeChanged);
             this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
             this.groupBoxWithBorder1.ResumeLayout(true);

+ 4 - 4
UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -51,7 +51,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 包装采集_Load(object sender, EventArgs e)
+        private void PackCollection_Load(object sender, EventArgs e)
         {
             //设置DbFind的必须的数据
             PrintNum.Text = "1";
@@ -64,12 +64,12 @@ namespace UAS_MES.Make
             sn_code.Focus();
         }
 
-        private void 包装采集_SizeChanged(object sender, EventArgs e)
+        private void PackCollection_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }
 
-        private void 包装采集_Activated(object sender, EventArgs e)
+        private void PackCollection_Activated(object sender, EventArgs e)
         {
             pa_outboxcode.Focus();
         }
@@ -337,7 +337,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 包装采集_FormClosing(object sender, FormClosingEventArgs e)
+        private void PackCollection_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
             dh.Dispose();

+ 4 - 4
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.Designer.cs

@@ -858,10 +858,10 @@
             this.Name = "Make_PackageCollectionWeigh";
             this.Tag = "Make!PackageCollectionWeigh";
             this.Text = "装箱称重";
-            this.Activated += new System.EventHandler(this.包装采集_Activated);
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.包装采集_FormClosing);
-            this.Load += new System.EventHandler(this.包装采集_Load);
-            this.SizeChanged += new System.EventHandler(this.包装采集_SizeChanged);
+            this.Activated += new System.EventHandler(this.Make_PackageCollectionWeigh_Activated);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PackageCollectionWeigh_FormClosing);
+            this.Load += new System.EventHandler(this.Make_PackageCollectionWeigh_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_PackageCollectionWeigh_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).EndInit();
             this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();

+ 4 - 4
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -69,7 +69,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 包装采集_Load(object sender, EventArgs e)
+        private void Make_PackageCollectionWeigh_Load(object sender, EventArgs e)
         {
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
             Baurate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
@@ -131,12 +131,12 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 包装采集_SizeChanged(object sender, EventArgs e)
+        private void Make_PackageCollectionWeigh_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }
 
-        private void 包装采集_Activated(object sender, EventArgs e)
+        private void Make_PackageCollectionWeigh_Activated(object sender, EventArgs e)
         {
             pa_outboxcode.Focus();
         }
@@ -423,7 +423,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 包装采集_FormClosing(object sender, FormClosingEventArgs e)
+        private void Make_PackageCollectionWeigh_FormClosing(object sender, FormClosingEventArgs e)
         {
             BaseUtil.ClosePrint(lbl);
             if (serialPort1.IsOpen)

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs

@@ -523,8 +523,8 @@
             this.Tag = "Make!BigBoxCollection";
             this.Text = "7";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_PalletCollection_FormClosing);
-            this.Load += new System.EventHandler(this.栈板称重_Load);
-            this.SizeChanged += new System.EventHandler(this.栈板称重_SizeChanged);
+            this.Load += new System.EventHandler(this.Make_PalletCollection_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_PalletCollection_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).EndInit();
             this.ResumeLayout(true);
             this.PerformLayout();

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -64,7 +64,7 @@ namespace UAS_MES.Make
             }
         }
 
-        private void 栈板称重_Load(object sender, EventArgs e)
+        private void Make_PalletCollection_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
             thread = new Thread(NewPrint);
@@ -297,7 +297,7 @@ namespace UAS_MES.Make
             pa_currentqty.Text = dh.getFieldDataByCondition("package", "pa_currentqty", "pa_outboxcode='" + pa_outboxcode.Text + "' and pa_type=3").ToString();
         }
 
-        private void 栈板称重_SizeChanged(object sender, EventArgs e)
+        private void Make_PalletCollection_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PositionStock.Designer.cs

@@ -507,8 +507,8 @@
             this.Name = "Make_PositionStock";
             this.Tag = "Make!PositionStock";
             this.Text = "岗位备料";
-            this.Load += new System.EventHandler(this.岗位备料_Load);
-            this.SizeChanged += new System.EventHandler(this.岗位备料_SizeChanged);
+            this.Load += new System.EventHandler(this.Make_PositionStock_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_PositionStock_SizeChanged);
             this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BatchProductDGV)).EndInit();

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -33,7 +33,7 @@ namespace UAS_MES.Make
             InitializeComponent();
         }
 
-        private void 岗位备料_Load(object sender, EventArgs e)
+        private void Make_PositionStock_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
             ma_code.TableName = "make left join product on ma_prodcode=pr_code ";
@@ -56,7 +56,7 @@ namespace UAS_MES.Make
             FillDataGridView();
         }
 
-        private void 岗位备料_SizeChanged(object sender, EventArgs e)
+        private void Make_PositionStock_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_Repair.Designer.cs

@@ -1046,7 +1046,7 @@
             this.Tag = "Make!Repair";
             this.Text = "维修作业";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Make_Repair_FormClosing);
-            this.Load += new System.EventHandler(this.维修作业_Load);
+            this.Load += new System.EventHandler(this.Make_Repair_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -55,7 +55,7 @@ namespace UAS_MES.Make
             InitializeComponent();
         }
 
-        private void 维修作业_Load(object sender, EventArgs e)
+        private void Make_Repair_Load(object sender, EventArgs e)
         {
             //为DBFind配置Call和Form的名称
             cr_code.FormName = Name;

+ 2 - 2
UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.Designer.cs

@@ -501,8 +501,8 @@
             this.Name = "Packing_CartonTransfer";
             this.Tag = "Packing!CartonTransfer";
             this.Text = "卡通箱转移";
-            this.Load += new System.EventHandler(this.卡通箱转移_Load);
-            this.SizeChanged += new System.EventHandler(this.卡通箱转移_SizeChanged);
+            this.Load += new System.EventHandler(this.Packing_CartonTransfer_Load);
+            this.SizeChanged += new System.EventHandler(this.Packing_CartonTransfer_SizeChanged);
             this.groupBoxWithBorder2.ResumeLayout(true);
             this.groupBoxWithBorder2.PerformLayout();
             this.groupBoxWithBorder1.ResumeLayout(true);

+ 2 - 2
UAS-MES/FunctionCode/Packing/Packing_CartonTransfer.cs

@@ -45,7 +45,7 @@ namespace UAS_MES.Packing
             InitializeComponent();
         }
 
-        private void 卡通箱转移_Load(object sender, EventArgs e)
+        private void Packing_CartonTransfer_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
             dh = new DataHelper();
@@ -53,7 +53,7 @@ namespace UAS_MES.Packing
             OperateResult.AppendText(">>请输入目标箱号\n", Color.Black);
         }
 
-        private void 卡通箱转移_SizeChanged(object sender, EventArgs e)
+        private void Packing_CartonTransfer_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }

+ 2 - 2
UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -332,8 +332,8 @@
             this.Name = "Query_ExeProgress";
             this.Tag = "Query!ExeProgress";
             this.Text = "工单执行进度";
-            this.Load += new System.EventHandler(this.工单执行进度_Load);
-            this.SizeChanged += new System.EventHandler(this.工单执行进度_SizeChanged);
+            this.Load += new System.EventHandler(this.Query_ExeProgress_Load);
+            this.SizeChanged += new System.EventHandler(this.Query_ExeProgress_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).EndInit();
             this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();

+ 2 - 2
UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -42,7 +42,7 @@ namespace UAS_MES.Query
             InitializeComponent();
         }
 
-        private void 工单执行进度_Load(object sender, EventArgs e)
+        private void Query_ExeProgress_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
             ScreenWidth = this.Width;
@@ -51,7 +51,7 @@ namespace UAS_MES.Query
             sn_code.Focus();
         }
 
-        private void 工单执行进度_SizeChanged(object sender, EventArgs e)
+        private void Query_ExeProgress_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
         }

+ 2 - 2
UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.Designer.cs

@@ -225,8 +225,8 @@
             this.Name = "SystemSetting_ScaleTest";
             this.Tag = "Setup!ScaleTest";
             this.Text = " ";
-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.电子秤调试_FormClosing);
-            this.Load += new System.EventHandler(this.电子秤调试_Load);
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SystemSetting_ScaleTest_FormClosing);
+            this.Load += new System.EventHandler(this.SystemSetting_ScaleTest_Load);
             this.panel4.ResumeLayout(false);
             this.panel4.PerformLayout();
             this.panel5.ResumeLayout(false);

+ 2 - 2
UAS-MES/FunctionCode/SystemSetting/SystemSetting_ScaleTest.cs

@@ -30,7 +30,7 @@ namespace UAS_MES.SystemSetting
             InitializeComponent();
         }
 
-        private void 电子秤调试_Load(object sender, EventArgs e)
+        private void SystemSetting_ScaleTest_Load(object sender, EventArgs e)
         {
             CheckForIllegalCrossThreadCalls = false;
             ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
@@ -91,7 +91,7 @@ namespace UAS_MES.SystemSetting
             }
         }
 
-        private void 电子秤调试_FormClosing(object sender, FormClosingEventArgs e)
+        private void SystemSetting_ScaleTest_FormClosing(object sender, FormClosingEventArgs e)
         {
             StopTest.PerformClick();
             try { ReadData = false; }