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

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -184,7 +184,7 @@ namespace UAS_MES.Make
                             //如果两次输入的序列号相同进行提示，不相同则进行下一步
                             if (bsncode != sncode.Text)
                             {
-                                if (!dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
+                                if ((ChangeResult.Checked && dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "' and ms_id='" + oMsId + "'")) || !dh.CheckExist("makeserial", "ms_sncode='" + sncode.Text + "'"))
                                 {
                                     string firstsn = "";
                                     string updateSql = "";