不勾选时直接查ms_stepcode，优化

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -113,15 +113,12 @@ namespace UAS_MES.Make
                                 }
                                 //根据ms_id查询
                                 sql.Clear();
-                                sql.Append("select 1 from makeserial where ms_id='"+oMsid+"' and ms_beforesn='"+code.Text+"' and ms_nextmacode is null and ms_outboxcode is null");
+                                sql.Append("select ms_stepcode from makeserial where ms_id='" + oMsid+"' and ms_beforesn='"+code.Text+"' and ms_nextmacode is null and ms_outboxcode is null");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
                                 //如果行数大于0则允许转号
                                 if (dt.Rows.Count > 0)
                                 {
-                                    sql.Clear();
-                                    sql.Append("select 1 from makeserial where ms_id='" + oMsid + "' and ms_stepcode='" + User.CurrentStepCode + "'");
-                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (dt.Rows.Count > 0)
+                                    if (dt.Rows[0]["ms_stepcode"].ToString()==User.CurrentStepCode)
                                     {
                                         step = 1;
 

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -82,15 +82,12 @@ namespace UAS_MES.Make
                                 }
                                 //根据ms_id查询
                                 sql.Clear();
-                                sql.Append("select 1 from makeserial where ms_id='" + oMsId + "' and ms_beforesn='" + sncode.Text + "' and ms_nextmacode is null and ms_outboxcode is null");
+                                sql.Append("select ms_stepcode from makeserial where ms_id='" + oMsId + "' and ms_beforesn='" + sncode.Text + "' and ms_nextmacode is null and ms_outboxcode is null");
                                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                                 //如果行数大于0则允许转号
                                 if (dt.Rows.Count > 0)
                                 {
-                                    sql.Clear();
-                                    sql.Append("select 1 from makeserial where ms_id='" + oMsId + "' and ms_stepcode='" + User.CurrentStepCode + "'");
-                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                    if (dt.Rows.Count > 0)
+                                    if (dt.Rows[0]["ms_stepcode"].ToString()==User.CurrentStepCode)
                                     {
                                         bsncode = sncode.Text;
                                         //显示序列号