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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -133,7 +133,7 @@ namespace UAS_MES.Make
                                     if (ChangeResult.Checked)
                                     {
                                         //勾选了
-                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + code.Text + "' and ms_id='" + oMsid + "' and ms_stepcode='" + User.CurrentStepCode + "'"))
+                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + code.Text + "' and ms_id='" + oMsid + "'"))
                                         {
                                             step = 1;
 

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -120,7 +120,7 @@ namespace UAS_MES.Make
                                 {
                                     //勾选是修改已转换的序列，矫正修改错了的序列号
                                     case CheckState.Checked:
-                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "' and ms_id='" + oMsId + "' and ms_stepcode='" + User.CurrentStepCode + "'"))
+                                        if (dh.CheckExist("MakeSerial", "ms_beforesn='" + sncode.Text + "' and ms_id='" + oMsId + "'"))
                                         {
                                             bsncode = sncode.Text;
                                             //显示序列号