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

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

@@ -39,6 +39,7 @@
             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();
@@ -129,11 +130,23 @@
             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);
+            // 
             // HeadBar
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.Controls.Add(this.AlwaysTop);
             this.Controls.Add(this.UpperCollection);
             this.Controls.Add(this.changepwdicon);
             this.Controls.Add(this.Change_psw);
@@ -171,5 +184,6 @@
         private System.Windows.Forms.PictureBox Change_psw;
         private System.Windows.Forms.PictureBox changepwdicon;
         private System.Windows.Forms.CheckBox UpperCollection;
+        private System.Windows.Forms.CheckBox AlwaysTop;
     }
 }

UAS-MES/CustomControl/HeadBar/HeadBar.cs

@@ -89,6 +89,7 @@ namespace UAS_MES.CustomControl
                 logouticon.Visible = false;
                 LoginOut.Visible = false;
                 Change_psw.Visible = false;
+                AlwaysTop.Visible = false;
                 UpperCollection.Visible = false;
             }
         }
@@ -143,5 +144,10 @@ namespace UAS_MES.CustomControl
         {
             SystemInf.UpperCollection = UpperCollection.Checked;
         }
+
+        private void AlwaysTop_CheckedChanged(object sender, EventArgs e)
+        {
+            this.FindForm().TopMost = AlwaysTop.Checked;
+        }
     }
 }

UAS-MES/CustomControl/HeadBar/HeadBar.resx

@@ -148,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TitleLabel.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="changepwdicon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -181,7 +181,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;changepwdicon.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="Change_psw.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -214,7 +214,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Change_psw.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="logouticon.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -244,7 +244,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;logouticon.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="LoginOut.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -277,7 +277,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;LoginOut.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="MinWindow2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -310,7 +310,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow2.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="MinWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -343,7 +343,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="MinWindow1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -376,7 +376,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;MinWindow1.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="CloseWindow.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Right</value>
@@ -409,7 +409,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CloseWindow.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="UpperCollection.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -442,6 +442,42 @@
     <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>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

UAS-MES/Main.Designer.cs

@@ -77,7 +77,7 @@
             this.MainTabControl.Margin = new System.Windows.Forms.Padding(4);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedIndex = 0;
-            this.MainTabControl.Size = new System.Drawing.Size(1095, 700);
+            this.MainTabControl.Size = new System.Drawing.Size(1091, 700);
             this.MainTabControl.TabIndex = 7;
             this.MainTabControl.Selected += new System.Windows.Forms.TabControlEventHandler(this.MainTabControl_Selected);
             this.MainTabControl.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.MainTabControl_ControlRemoved);
@@ -281,6 +281,7 @@
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Main";
             this.Text = "优软科技MES系统";
+            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);

UAS-MES/UAS-MES.csproj

@@ -38,11 +38,11 @@
     <ProductName>优软MES系统</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>优软MES系统</SuiteName>
-    <MinimumRequiredVersion>1.0.0.421</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.465</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>422</ApplicationRevision>
+    <ApplicationRevision>466</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -364,6 +364,12 @@
     <Compile Include="CustomControl\TextBoxWithIcon\SNCodeEnterTextBox.Designer.cs">
       <DependentUpon>SNCodeEnterTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SnCollectionBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\TextBoxWithIcon\SnCollectionBox.Designer.cs">
+      <DependentUpon>SnCollectionBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\TextBoxWithIcon\TextAreaForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -485,6 +491,12 @@
     <Compile Include="FunctionCode\Make\Make_GetReMakeSN.Designer.cs">
       <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_ImeiCheck.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ImeiCheck.Designer.cs">
+      <DependentUpon>Make_ImeiCheck.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_LabelCheck.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1087,6 +1099,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_GetReMakeSN.resx">
       <DependentUpon>Make_GetReMakeSN.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ImeiCheck.resx">
+      <DependentUpon>Make_ImeiCheck.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_LabelCheck.resx">
       <DependentUpon>Make_LabelCheck.cs</DependentUpon>
     </EmbeddedResource>

UAS_AutoPass/UAS_AutoPass.csproj

@@ -28,10 +28,10 @@
     <ProductName>UAS自动过站解析器</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>UAS自动过站解析器</SuiteName>
-    <MinimumRequiredVersion>1.0.0.15</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.20</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>16</ApplicationRevision>
+    <ApplicationRevision>21</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -100,6 +100,12 @@
     <Compile Include="AutoAnalysisXml.Designer.cs">
       <DependentUpon>AutoAnalysisXml.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form2.Designer.cs">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </Compile>
     <Compile Include="LoadingCircle.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -129,6 +135,9 @@
     <EmbeddedResource Include="AutoAnalysisXml.resx">
       <DependentUpon>AutoAnalysisXml.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form2.resx">
+      <DependentUpon>Form2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Login.resx">
       <DependentUpon>Login.cs</DependentUpon>
     </EmbeddedResource>

UAS_DLLTest/UAS_DLLTest.csproj

@@ -14,7 +14,6 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <PublishUrl>E:\s_user_site\DllTest\</PublishUrl>
     <Install>true</Install>
@@ -32,7 +31,7 @@
     <SuiteName>DLLTest</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>