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

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 + "'") && !onlyPass || onlyPass && TSN == code.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + code.Text + "' and ms_id <>'"+oMsid+"'")))
+                            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 + "'") && !onlyPass || onlyPass && bsncode == sncode.Text)) || (ChangeResult.Checked && !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id <>'" + oMsId + "'")))
+                            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_AutoPass/AutoAnalysisXml.cs

@@ -72,7 +72,7 @@ namespace UAS_AutoPass
             tipform = new Tip();
             InitializeComponent();
             iusercode = iUserName;
-            isource = iSource;
+            isource = iSource.ToUpper();
             StartPosition = FormStartPosition.CenterScreen;
         }