Merge branch 'master' of ssh://10.10.101.21/source/mes-client

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

@@ -38,6 +38,7 @@
             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();
             ((System.ComponentModel.ISupportInitialize)(this.changepwdicon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Change_psw)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.logouticon)).BeginInit();
@@ -117,11 +118,23 @@
             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);
+            // 
             // HeadBar
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.Controls.Add(this.UpperCollection);
             this.Controls.Add(this.changepwdicon);
             this.Controls.Add(this.Change_psw);
             this.Controls.Add(this.logouticon);
@@ -157,5 +170,6 @@
         private System.Windows.Forms.PictureBox logouticon;
         private System.Windows.Forms.PictureBox Change_psw;
         private System.Windows.Forms.PictureBox changepwdicon;
+        private System.Windows.Forms.CheckBox UpperCollection;
     }
 }

UAS-MES/CustomControl/HeadBar/HeadBar.cs

@@ -89,6 +89,7 @@ namespace UAS_MES.CustomControl
                 logouticon.Visible = false;
                 LoginOut.Visible = false;
                 Change_psw.Visible = false;
+                UpperCollection.Visible = false;
             }
         }
 
@@ -137,5 +138,10 @@ namespace UAS_MES.CustomControl
             BaseUtil.SetFormCenter(chagepwd);
             chagepwd.ShowDialog();
         }
+
+        private void UpperCollection_CheckedChanged(object sender, EventArgs e)
+        {
+            SystemInf.UpperCollection = UpperCollection.Checked;
+        }
     }
-}
+}

UAS-MES/CustomControl/HeadBar/HeadBar.resx

@@ -130,13 +130,10 @@
     <value>NoControl</value>
   </data>
   <data name="TitleLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 6</value>
-  </data>
-  <data name="TitleLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 0, 2, 0</value>
+    <value>16, 8</value>
   </data>
   <data name="TitleLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 21</value>
+    <value>0, 27</value>
   </data>
   <data name="TitleLabel.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -151,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TitleLabel.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="changepwdicon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -160,10 +157,13 @@
     <value>NoControl</value>
   </data>
   <data name="changepwdicon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>305, 0</value>
+    <value>406, 0</value>
+  </data>
+  <data name="changepwdicon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="changepwdicon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>26, 32</value>
+    <value>35, 40</value>
   </data>
   <data name="changepwdicon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -181,7 +181,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;changepwdicon.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="Change_psw.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -190,13 +190,13 @@
     <value>NoControl</value>
   </data>
   <data name="Change_psw.Location" type="System.Drawing.Point, System.Drawing">
-    <value>331, 0</value>
+    <value>441, 0</value>
   </data>
   <data name="Change_psw.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+    <value>3, 2, 3, 2</value>
   </data>
   <data name="Change_psw.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 32</value>
+    <value>128, 40</value>
   </data>
   <data name="Change_psw.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -214,7 +214,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Change_psw.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="logouticon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -223,10 +223,13 @@
     <value>NoControl</value>
   </data>
   <data name="logouticon.Location" type="System.Drawing.Point, System.Drawing">
-    <value>427, 0</value>
+    <value>569, 0</value>
+  </data>
+  <data name="logouticon.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="logouticon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>33, 32</value>
+    <value>44, 40</value>
   </data>
   <data name="logouticon.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -241,7 +244,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;logouticon.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="LoginOut.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -250,13 +253,13 @@
     <value>NoControl</value>
   </data>
   <data name="LoginOut.Location" type="System.Drawing.Point, System.Drawing">
-    <value>460, 0</value>
+    <value>613, 0</value>
   </data>
   <data name="LoginOut.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
+    <value>3, 2, 3, 2</value>
   </data>
   <data name="LoginOut.Size" type="System.Drawing.Size, System.Drawing">
-    <value>45, 32</value>
+    <value>60, 40</value>
   </data>
   <data name="LoginOut.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>CenterImage</value>
@@ -274,7 +277,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;LoginOut.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="MinWindow2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -283,10 +286,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>505, 0</value>
+    <value>673, 0</value>
+  </data>
+  <data name="MinWindow2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="MinWindow2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 32</value>
+    <value>20, 40</value>
   </data>
   <data name="MinWindow2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -304,7 +310,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow2.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="MinWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -313,10 +319,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>520, 0</value>
+    <value>693, 0</value>
+  </data>
+  <data name="MinWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="MinWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 32</value>
+    <value>40, 40</value>
   </data>
   <data name="MinWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -334,7 +343,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="MinWindow1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -343,10 +352,13 @@
     <value>NoControl</value>
   </data>
   <data name="MinWindow1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>550, 0</value>
+    <value>733, 0</value>
+  </data>
+  <data name="MinWindow1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="MinWindow1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>15, 32</value>
+    <value>20, 40</value>
   </data>
   <data name="MinWindow1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -364,7 +376,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow1.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="CloseWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -373,10 +385,13 @@
     <value>NoControl</value>
   </data>
   <data name="CloseWindow.Location" type="System.Drawing.Point, System.Drawing">
-    <value>565, 0</value>
+    <value>753, 0</value>
+  </data>
+  <data name="CloseWindow.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="CloseWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>30, 32</value>
+    <value>40, 40</value>
   </data>
   <data name="CloseWindow.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -394,16 +409,52 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CloseWindow.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</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>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
+    <value>8, 15</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>595, 32</value>
+    <value>793, 40</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>HeadBar</value>

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs

@@ -0,0 +1,54 @@
+using UAS_MES.Entity;
+
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    partial class SnCollectionBox
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+        }
+
+        public override string Text
+        {
+            get
+            {
+                if (SystemInf.UpperCollection)
+                    return base.Text.ToUpper();
+                else
+                    return base.Text;
+            }
+
+            set
+            {
+                base.Text = value;
+            }
+        }
+
+        #endregion
+    }
+}

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace UAS_MES.CustomControl.TextBoxWithIcon
+{
+    public partial class SnCollectionBox : EnterTextBox
+    {
+        public SnCollectionBox()
+        {
+            InitializeComponent();
+        }
+    }
+}

UAS-MES/Entity/SystemInf.cs

@@ -69,5 +69,7 @@ namespace UAS_MES.Entity
         /// 缓存的XML文件的路径和名称
         /// </summary>
         public static string CacheFilePath= Environment.GetEnvironmentVariable("windir").Substring(0, 1) + @":\UAS_MES\CacheFile\CacheInfo.xml";
+
+        public static bool UpperCollection = true;
     }
 }

UAS-MES/Main.Designer.cs

@@ -59,7 +59,8 @@
             this.ProductName.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.ProductName.Font = new System.Drawing.Font("微软雅黑", 13F);
             this.ProductName.ForeColor = System.Drawing.SystemColors.ButtonFace;
-            this.ProductName.Location = new System.Drawing.Point(81, 1);
+            this.ProductName.Location = new System.Drawing.Point(108, 3);
+            this.ProductName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ProductName.Name = "ProductName";
             this.ProductName.Size = new System.Drawing.Size(233, 30);
             this.ProductName.TabIndex = 3;
@@ -72,10 +73,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.MainTabControl.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.MainTabControl.ItemSize = new System.Drawing.Size(96, 25);
-            this.MainTabControl.Location = new System.Drawing.Point(157, 33);
+            this.MainTabControl.Location = new System.Drawing.Point(209, 41);
+            this.MainTabControl.Margin = new System.Windows.Forms.Padding(4);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(821, 560);
+            this.MainTabControl.Size = new System.Drawing.Size(1095, 700);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
             // 
@@ -84,7 +86,8 @@
             this.inf_name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name_label.AutoSize = true;
             this.inf_name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name_label.Location = new System.Drawing.Point(6, 8);
+            this.inf_name_label.Location = new System.Drawing.Point(8, 10);
+            this.inf_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_name_label.Name = "inf_name_label";
             this.inf_name_label.Size = new System.Drawing.Size(43, 20);
             this.inf_name_label.TabIndex = 4;
@@ -103,9 +106,10 @@
             this.BasicInf.Controls.Add(this.Inf_source_label);
             this.BasicInf.Controls.Add(this.inf_name_label);
             this.BasicInf.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.BasicInf.Location = new System.Drawing.Point(0, 593);
+            this.BasicInf.Location = new System.Drawing.Point(0, 741);
+            this.BasicInf.Margin = new System.Windows.Forms.Padding(4);
             this.BasicInf.Name = "BasicInf";
-            this.BasicInf.Size = new System.Drawing.Size(978, 31);
+            this.BasicInf.Size = new System.Drawing.Size(1304, 39);
             this.BasicInf.TabIndex = 6;
             this.BasicInf.SizeChanged += new System.EventHandler(this.BasicInf_SizeChanged);
             // 
@@ -114,7 +118,8 @@
             this.Inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_currentstep.AutoSize = true;
             this.Inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_currentstep.Location = new System.Drawing.Point(228, 8);
+            this.Inf_currentstep.Location = new System.Drawing.Point(304, 10);
+            this.Inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_currentstep.Name = "Inf_currentstep";
             this.Inf_currentstep.Size = new System.Drawing.Size(0, 20);
             this.Inf_currentstep.TabIndex = 15;
@@ -124,7 +129,8 @@
             this.Inf_currentstep_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_currentstep_label.AutoSize = true;
             this.Inf_currentstep_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_currentstep_label.Location = new System.Drawing.Point(147, 8);
+            this.Inf_currentstep_label.Location = new System.Drawing.Point(196, 10);
+            this.Inf_currentstep_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_currentstep_label.Name = "Inf_currentstep_label";
             this.Inf_currentstep_label.Size = new System.Drawing.Size(73, 20);
             this.Inf_currentstep_label.TabIndex = 14;
@@ -135,7 +141,8 @@
             this.Inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_name.AutoSize = true;
             this.Inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_name.Location = new System.Drawing.Point(64, 8);
+            this.Inf_name.Location = new System.Drawing.Point(85, 10);
+            this.Inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_name.Name = "Inf_name";
             this.Inf_name.Size = new System.Drawing.Size(0, 20);
             this.Inf_name.TabIndex = 13;
@@ -145,7 +152,8 @@
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(406, 8);
+            this.Inf_linecode.Location = new System.Drawing.Point(541, 10);
+            this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode.Name = "Inf_linecode";
             this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
             this.Inf_linecode.TabIndex = 11;
@@ -155,7 +163,8 @@
             this.Inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source.AutoSize = true;
             this.Inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source.Location = new System.Drawing.Point(565, 8);
+            this.Inf_source.Location = new System.Drawing.Point(753, 10);
+            this.Inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source.Name = "Inf_source";
             this.Inf_source.Size = new System.Drawing.Size(0, 20);
             this.Inf_source.TabIndex = 10;
@@ -165,7 +174,8 @@
             this.Inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_db.AutoSize = true;
             this.Inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_db.Location = new System.Drawing.Point(772, 8);
+            this.Inf_db.Location = new System.Drawing.Point(1029, 10);
+            this.Inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_db.Name = "Inf_db";
             this.Inf_db.Size = new System.Drawing.Size(0, 20);
             this.Inf_db.TabIndex = 9;
@@ -175,7 +185,8 @@
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(346, 8);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 10);
+            this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
             this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_linecode_label.TabIndex = 8;
@@ -186,7 +197,8 @@
             this.Inf_db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_db_label.AutoSize = true;
             this.Inf_db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_db_label.Location = new System.Drawing.Point(701, 8);
+            this.Inf_db_label.Location = new System.Drawing.Point(935, 10);
+            this.Inf_db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_db_label.Name = "Inf_db_label";
             this.Inf_db_label.Size = new System.Drawing.Size(58, 20);
             this.Inf_db_label.TabIndex = 7;
@@ -197,7 +209,8 @@
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(505, 8);
+            this.Inf_source_label.Location = new System.Drawing.Point(673, 10);
+            this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source_label.Name = "Inf_source_label";
             this.Inf_source_label.Size = new System.Drawing.Size(43, 20);
             this.Inf_source_label.TabIndex = 6;
@@ -209,18 +222,19 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.Menu);
-            this.panel1.Location = new System.Drawing.Point(0, 32);
+            this.panel1.Location = new System.Drawing.Point(0, 40);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(155, 562);
+            this.panel1.Size = new System.Drawing.Size(206, 702);
             this.panel1.TabIndex = 1;
             // 
             // Menu
             // 
             this.Menu.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Menu.Location = new System.Drawing.Point(0, 0);
-            this.Menu.Margin = new System.Windows.Forms.Padding(4);
+            this.Menu.Margin = new System.Windows.Forms.Padding(5);
             this.Menu.Name = "Menu";
-            this.Menu.Size = new System.Drawing.Size(153, 560);
+            this.Menu.Size = new System.Drawing.Size(204, 700);
             this.Menu.TabIndex = 3;
             // 
             // notifyIcon1
@@ -232,8 +246,9 @@
             // 
             this.pictureBox1.Image = global::UAS_MES.Properties.Resources.uas_blue;
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(75, 33);
+            this.pictureBox1.Size = new System.Drawing.Size(100, 41);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 4;
             this.pictureBox1.TabStop = false;
@@ -243,17 +258,17 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
-            this.headBar1.Margin = new System.Windows.Forms.Padding(4);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(5);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(978, 32);
+            this.headBar1.Size = new System.Drawing.Size(1304, 40);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = null;
             // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(978, 624);
+            this.ClientSize = new System.Drawing.Size(1304, 780);
             this.Controls.Add(this.BasicInf);
             this.Controls.Add(this.MainTabControl);
             this.Controls.Add(this.pictureBox1);
@@ -262,6 +277,7 @@
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);