调整TSN转TSN

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

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

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

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