修复报废品有两次维修时显示

UAS-MES/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -291,13 +291,13 @@
             this.Load += new System.EventHandler(this.工单执行进度_Load);
             this.SizeChanged += new System.EventHandler(this.工单执行进度_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).EndInit();
-            this.groupBoxWithBorder1.ResumeLayout(false);
+            this.groupBoxWithBorder1.ResumeLayout(true);
             this.groupBoxWithBorder1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -107,7 +107,17 @@ namespace UAS_MES.Query
                                 if (!PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString() + "," + RejectStep) || RejectStep == "")
                                     PaintColor.Add(Brushes.Green);
                                 else
+                                {
+                                    //判断之前有没有添加过黑色
+                                    if (PaintColor.Contains(Brushes.Black))
+                                    {
+                                        //移除之前的，
+                                        int index = PaintColor.IndexOf(Brushes.Black);
+                                        PaintColor.RemoveAt(PaintColor.IndexOf(Brushes.Black));
+                                        PaintColor.Insert(index, Brushes.Green);
+                                    }
                                     PaintColor.Add(Brushes.Black);
+                                }
                             }
                         }
                         //不包含说明是线外工序