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

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

@@ -71,8 +71,6 @@
             // 
             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;

UAS-MES/CustomControl/HeadBar/HeadBar.resx

@@ -210,6 +210,9 @@
   <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>

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -246,7 +246,7 @@ namespace UAS_MES.Make
                                 }
                             }
                             //开始录入SN
-                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ')<>' '") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+ "' and nvl(ms_nextmacode,' ')<>' '")))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'" + oMsid + "' and nvl(ms_nextmacode,' ') =' '") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+ "' and nvl(ms_nextmacode,' ') =' '")))
                             {
                                 onlyPass = false;
                                 //SN校验成功，合法,记录下SN

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -208,7 +208,7 @@ namespace UAS_MES.Make
                                     return;
                             }
                             //防呆验证完成
-                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ')<>' '") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ')<>' '")))
+                            if ((!ChangeResult.Checked && (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ') =' '") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "' and nvl(ms_nextmacode,' ') =' '")))
                             {
                                 if (!ChangeResult.Checked && !onlyPass || bsncode != sncode.Text)
                                 {

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 = true;
+            this.TopMost = false;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
             this.Load += new System.EventHandler(this.Main_Load);
             this.BasicInf.ResumeLayout(false);