解决冲突

Venus/Venus_RT/FAs/FaEvent.cs

@@ -1,5 +1,4 @@
-using Aitex.Controls.RecipeCompare;
-using Aitex.Core.Common;
+using Aitex.Core.Common;
 using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
 using Aitex.Core.RT.OperationCenter;

Venus/Venus_RT/FAs/FaManager.cs

@@ -80,12 +80,12 @@ namespace Venus_RT.HostWrapper
                 case "PMB.RecipeProcessTime":
                     svName = "PMB.RecipeTotalElapsedSeconds";
                     break;
-                case "PMC.RecipeProcessTime":
-                    svName = "PMC.RecipeTotalElapsedSeconds";
-                    break;
-                case "PMD.RecipeProcessTime":
-                    svName = "PMD.RecipeTotalElapsedSeconds";
-                    break;
+                //case "PMC.RecipeProcessTime":
+                //    svName = "PMC.RecipeTotalElapsedSeconds";
+                //    break;
+                //case "PMD.RecipeProcessTime":
+                //    svName = "PMD.RecipeTotalElapsedSeconds";
+                //    break;
             }
             //if (svName == "PMA.RecipeProcessTime")
             //    svName = "PMA.RecipeTotalElapsedSeconds";