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 + "'"))
+                            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"))
                             {
                                 //SN校验成功，合法,记录下SN
                                 SN = code.Text;

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -218,9 +218,9 @@ namespace UAS_MES.Make
                                 return;
                             }
                             //如果两次输入的序列号相同进行提示，不相同则进行下一步
-                            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 + "'"))
+                            //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"))
                                 {
                                     string firstsn = "";
                                     string updateSql = "";
@@ -268,11 +268,11 @@ namespace UAS_MES.Make
                                 }
                                 else
                                     OperateResult.AppendText(">>序列号" + sncode.Text + "已存在，请输入其他序列号\n", Color.Red);
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
-                            }
+                            //}
+                            //else
+                            //{
+                            //    OperateResult.AppendText(">>相同序列号不能进行转换\n", Color.Red);
+                            //}
                             sncode.Text = "";
                         }
                     }