修改弹出窗体

UAS-MES/CustomControl/HeadBar/HeadBar.Designer.cs

@@ -30,6 +30,8 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HeadBar));
             this.TitleLabel = new System.Windows.Forms.Label();
+            this.UpperCollection = new System.Windows.Forms.CheckBox();
+            this.AlwaysTop = new System.Windows.Forms.CheckBox();
             this.changepwdicon = new System.Windows.Forms.PictureBox();
             this.Change_psw = new System.Windows.Forms.PictureBox();
             this.logouticon = new System.Windows.Forms.PictureBox();
@@ -38,8 +40,6 @@
             this.MinWindow = new System.Windows.Forms.PictureBox();
             this.MinWindow1 = new System.Windows.Forms.PictureBox();
             this.CloseWindow = new System.Windows.Forms.PictureBox();
-            this.UpperCollection = new System.Windows.Forms.CheckBox();
-            this.AlwaysTop = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.changepwdicon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Change_psw)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.logouticon)).BeginInit();
@@ -56,6 +56,28 @@
             this.TitleLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight;
             this.TitleLabel.Name = "TitleLabel";
             // 
+            // UpperCollection
+            // 
+            resources.ApplyResources(this.UpperCollection, "UpperCollection");
+            this.UpperCollection.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.UpperCollection.Checked = true;
+            this.UpperCollection.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.UpperCollection.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.UpperCollection.Name = "UpperCollection";
+            this.UpperCollection.UseVisualStyleBackColor = false;
+            this.UpperCollection.CheckedChanged += new System.EventHandler(this.UpperCollection_CheckedChanged);
+            // 
+            // AlwaysTop
+            // 
+            resources.ApplyResources(this.AlwaysTop, "AlwaysTop");
+            this.AlwaysTop.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.AlwaysTop.Checked = true;
+            this.AlwaysTop.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.AlwaysTop.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
+            this.AlwaysTop.Name = "AlwaysTop";
+            this.AlwaysTop.UseVisualStyleBackColor = false;
+            this.AlwaysTop.CheckedChanged += new System.EventHandler(this.AlwaysTop_CheckedChanged);
+            // 
             // changepwdicon
             // 
             resources.ApplyResources(this.changepwdicon, "changepwdicon");
@@ -119,26 +141,6 @@
             this.CloseWindow.TabStop = false;
             this.CloseWindow.Click += new System.EventHandler(this.CloseWindow_Click);
             // 
-            // UpperCollection
-            // 
-            resources.ApplyResources(this.UpperCollection, "UpperCollection");
-            this.UpperCollection.BackColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.UpperCollection.Checked = true;
-            this.UpperCollection.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.UpperCollection.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.UpperCollection.Name = "UpperCollection";
-            this.UpperCollection.UseVisualStyleBackColor = false;
-            this.UpperCollection.CheckedChanged += new System.EventHandler(this.UpperCollection_CheckedChanged);
-            // 
-            // AlwaysTop
-            // 
-            resources.ApplyResources(this.AlwaysTop, "AlwaysTop");
-            this.AlwaysTop.BackColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.AlwaysTop.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.AlwaysTop.Name = "AlwaysTop";
-            this.AlwaysTop.UseVisualStyleBackColor = false;
-            this.AlwaysTop.CheckedChanged += new System.EventHandler(this.AlwaysTop_CheckedChanged);
-            // 
             // HeadBar
             // 
             resources.ApplyResources(this, "$this");

UAS-MES/CustomControl/HeadBar/HeadBar.resx

@@ -150,6 +150,78 @@
   <data name="&gt;&gt;TitleLabel.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
+  <data name="UpperCollection.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="UpperCollection.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Right</value>
+  </data>
+  <data name="UpperCollection.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
+  </data>
+  <data name="UpperCollection.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
+    <value>315, 0</value>
+  </data>
+  <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
+    <value>91, 40</value>
+  </data>
+  <data name="UpperCollection.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="UpperCollection.Text" xml:space="preserve">
+    <value>大写采集</value>
+  </data>
+  <data name="&gt;&gt;UpperCollection.Name" xml:space="preserve">
+    <value>UpperCollection</value>
+  </data>
+  <data name="&gt;&gt;UpperCollection.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;UpperCollection.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;UpperCollection.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="AlwaysTop.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="AlwaysTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Right</value>
+  </data>
+  <data name="AlwaysTop.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 9pt</value>
+  </data>
+  <data name="AlwaysTop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="AlwaysTop.Location" type="System.Drawing.Point, System.Drawing">
+    <value>224, 0</value>
+  </data>
+  <data name="AlwaysTop.Size" type="System.Drawing.Size, System.Drawing">
+    <value>91, 40</value>
+  </data>
+  <data name="AlwaysTop.TabIndex" type="System.Int32, mscorlib">
+    <value>14</value>
+  </data>
+  <data name="AlwaysTop.Text" xml:space="preserve">
+    <value>窗体最前</value>
+  </data>
+  <data name="&gt;&gt;AlwaysTop.Name" xml:space="preserve">
+    <value>AlwaysTop</value>
+  </data>
+  <data name="&gt;&gt;AlwaysTop.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;AlwaysTop.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;AlwaysTop.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="changepwdicon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
   </data>
@@ -411,78 +483,6 @@
   <data name="&gt;&gt;CloseWindow.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
-  <data name="UpperCollection.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="UpperCollection.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="UpperCollection.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
-  </data>
-  <data name="UpperCollection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>315, 0</value>
-  </data>
-  <data name="UpperCollection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 40</value>
-  </data>
-  <data name="UpperCollection.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="UpperCollection.Text" xml:space="preserve">
-    <value>大写采集</value>
-  </data>
-  <data name="&gt;&gt;UpperCollection.Name" xml:space="preserve">
-    <value>UpperCollection</value>
-  </data>
-  <data name="&gt;&gt;UpperCollection.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;UpperCollection.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;UpperCollection.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="AlwaysTop.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="AlwaysTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="AlwaysTop.Font" type="System.Drawing.Font, System.Drawing">
-    <value>微软雅黑, 9pt</value>
-  </data>
-  <data name="AlwaysTop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="AlwaysTop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>224, 0</value>
-  </data>
-  <data name="AlwaysTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 40</value>
-  </data>
-  <data name="AlwaysTop.TabIndex" type="System.Int32, mscorlib">
-    <value>14</value>
-  </data>
-  <data name="AlwaysTop.Text" xml:space="preserve">
-    <value>窗体最前</value>
-  </data>
-  <data name="AlwaysTop.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;AlwaysTop.Name" xml:space="preserve">
-    <value>AlwaysTop</value>
-  </data>
-  <data name="&gt;&gt;AlwaysTop.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;AlwaysTop.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;AlwaysTop.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/DbFind.cs

@@ -8,7 +8,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES
 {
-    public partial class DbFind : Form
+    public partial class DbFind : CustomControl.BaseForm.BaseForm
     {
         //判断是否配置了DbFind
         bool IsAbleDbFind;

UAS-MES/FunctionCode/Employee/Employee_NewGroup.cs

@@ -11,7 +11,7 @@ using UAS_MES.Entity;
 
 namespace UAS_MES.Employee
 {
-    public partial class Employee_NewGroup : Form
+    public partial class Employee_NewGroup : CustomControl.BaseForm.BaseForm
     {
         DataHelper dh;
 

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -13,7 +13,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
-    public partial class Make_NewBadCode : Form
+    public partial class Make_NewBadCode : CustomControl.BaseForm.BaseForm
     {
         //所有用到了headBar的部分都需要这段代码
         [DllImport("user32.dll")]

UAS-MES/FunctionCode/Make/Make_NewBadCode_DE.cs

@@ -13,7 +13,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
-    public partial class Make_NewBadCode_DE : Form
+    public partial class Make_NewBadCode_DE : CustomControl.BaseForm.BaseForm
     {
         //所有用到了headBar的部分都需要这段代码
         [DllImport("user32.dll")]

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -13,7 +13,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
-    public partial class Make_NewMatainInf : Form
+    public partial class Make_NewMatainInf : CustomControl.BaseForm.BaseForm
     {
         //所有用到了headBar的部分都需要这段代码
         [DllImport("user32.dll")]

UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -7,7 +7,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
-    public partial class Make_NewPallet : Form
+    public partial class Make_NewPallet : CustomControl.BaseForm.BaseForm
     {
         DataHelper dh;
         DataTable Dbfind;

UAS-MES/FunctionCode/Warehouse/Warehouse_NewPiInOut.cs

@@ -13,7 +13,7 @@ using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Warehouse
 {
-    public partial class Warehouse_NewPiInOut : Form
+    public partial class Warehouse_NewPiInOut : CustomControl.BaseForm.BaseForm
     {
 
         [DllImport("user32.dll")]

UAS-MES/Main.Designer.cs

@@ -281,7 +281,7 @@
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
-            this.TopMost = false;
+            this.TopMost = true;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.Load += new System.EventHandler(this.Main_Load);
             this.BasicInf.ResumeLayout(false);