执行步骤排序

UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -61,8 +61,8 @@ namespace UAS_MES.Query
                 }
                 //查询执行过的步骤
                 sql.Clear();
-                sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail  on cd_crid = cr_id  left join makeserial ");
-                sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_sncode='"+sn_code.Text+"'");
+                sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail on cd_crid = cr_id  left join makeserial ");
+                sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_sncode='"+sn_code.Text+"' order by cd_detno");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 Step = new Dictionary<int, string>();
                 PastStep = dh.getFieldDataByCondition("makeserial", "ms_paststep", "ms_sncode='" + sn_code.Text + "'").ToString();
@@ -132,7 +132,7 @@ namespace UAS_MES.Query
                             }
                             else
                             {
-                                if (Step[j].Contains("开始") || Step[j].Contains("结束"))
+                                if (Step[j].Contains("开始"))
                                     g.FillEllipse(Brushes.Green, r);
                                 else
                                     g.FillRectangle(Brushes.White, r);
@@ -168,7 +168,7 @@ namespace UAS_MES.Query
                             }
                             else
                             {
-                                if (Step[j].Contains("开始") || Step[j].Contains("结束"))
+                                if (Step[j].Contains("开始"))
                                 {
                                     g.FillEllipse(Brushes.Green, r);
                                 }