同步11月8号代码

git-svn-id: http://10.4.3.168:50001/svn/Furnace@17 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/RTEquipmentLibrary/HardwareUnits/Robots/HRC100Robots/GM201LVPRobot/GM201LVPRobot.cs

@@ -476,10 +476,10 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HRC100Robots.G
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB81", $"{Name} Robot Occurred Error:Fork 1/Pre-aligner: WaferAbsence Confirmation Time- out Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB82", $"{Name} Robot Occurred Error:Fork 1/Pre-aligner: Wafer Presence Confirmation Time-out Error 2.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB83", $"{Name} Robot Occurred Error:Fork 1/Pre-aligner: WaferAbsence Confirmation Time- out Error 2.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB88", $"{Name} Robot Occurred Error:Grip sensor Time-out Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB89", $"{Name} Robot Occurred Error:Grip sensor Time-out Error 2.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB8A", $"{Name} Robot Occurred Error:UnGrip sensor Time-out Error1.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB8B", $"{Name} Robot Occurred Error:UnGrip sensor Time-out Error2.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB88", $"{Name} Robot Occurred Error:Wafer is not found on the Wafer transfer after having completed the wafer pick operation from source (by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB89", $"{Name} Robot Occurred Error:Wafer is not found on the Wafer transfer after having completed the wafer pick operation from source (by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB8A", $"{Name} Robot Occurred Error:Wafer is not found on the Wafer transfer after having completed the wafer place operation to the target(by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB8B", $"{Name} Robot Occurred Error:Wafer is not found on the Wafer transfer after having completed the wafer place operation to the target(by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB8F", $"{Name} Robot Occurred Error:Fork 1: Plunger non-operationerror.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB90", $"{Name} Robot Occurred Error:Fork 2: Wafer Presence Confirmation Time-out Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB91", $"{Name} Robot Occurred Error:Fork 2: Wafer AbsenceConfirmation Time-out Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
@@ -492,10 +492,10 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HRC100Robots.G
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorB9F", $"{Name} Robot Occurred Error:Fork 2: Plunger non-operationerror.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA0", $"{Name} Robot Occurred Error:Fork 1/Pre-aligner: WaferAbsence Error.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA1", $"{Name} Robot Occurred Error:Fork 1: Sensor StatusMismatch.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA8", $"{Name} Robot Occurred Error:Grip sensor status Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA9", $"{Name} Robot Occurred Error:Grip sensor status Error 2.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAA", $"{Name} Robot Occurred Error:Ungrip sensor status Error 1.", EventLevel.Alarm, EventType.EventUI_Notify));
-            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAB", $"{Name} Robot Occurred Error:Ungrip sensor status Error 2.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA8", $"{Name} Robot Occurred Error:Wafer is found on the Wafer transfer when started the wafer pick operation from source (by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBA9", $"{Name} Robot Occurred Error:Wafer is found on the Wafer transfer when started the wafer pick operation from source (by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAA", $"{Name} Robot Occurred Error:Wafer is found on the Wafer transfer when started the wafer place operation to the target(by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
+            EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAB", $"{Name} Robot Occurred Error:Wafer is found on the Wafer transfer when started the wafer place operation to the target(by sensor information).Check the wafer status on the Wafer transfer.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAC", $"{Name} Robot Occurred Error:Grip sensor status mismatch.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBAD", $"{Name} Robot Occurred Error:Lifter/Grip sensor statusmismatch.", EventLevel.Alarm, EventType.EventUI_Notify));
             EV.Subscribe(new EventItem("Alarm", $"{Name}ErrorBB0", $"{Name} Robot Occurred Error:Fork 2: Wafer Absence Error.", EventLevel.Alarm, EventType.EventUI_Notify));

FrameworkLocal/UICore/DeviceControl/AITGasValve.xaml

@@ -51,15 +51,12 @@
                          CenterY="{Binding ElementName=GasValve,Path=Height,Converter={StaticResource transformConvert}}"/>
     </UserControl.RenderTransform>
     <Grid  MouseLeftButtonUp="imgValveClose_MouseLeftButtonUp" TouchUp="imgValve_TouchUp"  IsEnabled="{Binding IsManagerPermission}"  >
-        <Button   Background="DarkGray" VerticalContentAlignment="Stretch" Visibility="{Binding  ElementName=GasValve,Path=IsDisableMode ,Converter={StaticResource bool2VisibilityConverter}}">
+        <Button  Panel.ZIndex="1"   Background="DarkGray" VerticalContentAlignment="Stretch" Visibility="{Binding  ElementName=GasValve,Path=IsDisableMode ,Converter={StaticResource bool2VisibilityConverter}}">
         </Button>
-        <Image Name="imgValveOpen" Width="{Binding ElementName=GasValve,Path=Width}" Height="{Binding ElementName=GasValve,Path=Height}"/>
-        <Image  Name="imgValveClose" Width="{Binding ElementName=GasValve,Path=Width}" Height="{Binding ElementName=GasValve,Path=Height}"/>
-
-        <TextBlock    Text="{Binding ValveDisplayName}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="-1 0 0 0" FontFamily="Calibri" FontSize="10"  x:Name="ValveName"/>
-
-
+        <Image  Panel.ZIndex="2"  Name="imgValveOpen" Width="{Binding ElementName=GasValve,Path=Width}" Height="{Binding ElementName=GasValve,Path=Height}"/>
+        <Image  Panel.ZIndex="3"  Name="imgValveClose" Width="{Binding ElementName=GasValve,Path=Width}" Height="{Binding ElementName=GasValve,Path=Height}"/>
 
+        <TextBlock   Panel.ZIndex="4" Text="{Binding ValveDisplayName}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="-1 0 0 0" FontFamily="Calibri" FontSize="10"  x:Name="ValveName"/>
     </Grid>
 
 

Furnace/FurnaceGasPanelUI/Properties/AssemblyInfo.cs

@@ -54,5 +54,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.63")]
-[assembly: AssemblyFileVersion("0.0.2.63")]
+[assembly: AssemblyVersion("0.0.2.66")]
+[assembly: AssemblyFileVersion("0.0.2.66")]

Furnace/FurnaceRT/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.64")]
-[assembly: AssemblyFileVersion("0.0.2.64")]
+[assembly: AssemblyVersion("0.0.2.66")]
+[assembly: AssemblyFileVersion("0.0.2.66")]

Furnace/FurnaceRT/ReleaseNotes.txt

@@ -6,6 +6,12 @@
 					 Furnace 系统更新历史记录
 
 ---------------------------------------------------------------------------------
+1.Robot更新报警描述
+2024-11-8 version 0.0.2.66
+11、ELK中AUX界面点位显示
+12、GasLine添加权限
+
+2024-11-6 version 0.0.2.65
 1、bug168 文件夹里面的recipe，双击后会展开左右移动
 2、bug169 sibcn不用显示出来gasline模块
 3、bug51 wafer thick界面删掉
@@ -16,8 +22,10 @@
 8、bug57 visible,name包括后面框长度可以拉缩，要固定住
 9、bug58 单词拼写，format
 10、bug56 data charting删的时候报错
-11、ELK中AUX界面点位显示
-12、GasLine添加权限
+11、切换step时，MFC值改变
+12、depo字段，process log导出添加
+
+
 2024-11-4 version 0.0.2.64
 1.DPO的状态显示灯根据点位D341.3显示
 2.欧陆通讯增加inerval设定

Furnace/FurnaceUI/Properties/AssemblyInfo.cs

@@ -54,5 +54,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.2.64")]
-[assembly: AssemblyFileVersion("0.0.2.64")]
+[assembly: AssemblyVersion("0.0.2.66")]
+[assembly: AssemblyFileVersion("0.0.2.66")]

Furnace/FurnaceUI/Views/Editors/RecipeCommandView.xaml

@@ -4,7 +4,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:cal="http://www.caliburn.org" xmlns:editors="clr-namespace:FurnaceUI.Views.Editors" d:DataContext="{d:DesignInstance Type=editors:RecipeCommandViewModel}"
+             xmlns:cal="http://www.caliburn.org" xmlns:editors="clr-namespace:FurnaceUI.Views.Editors" xmlns:controls="http://OpenSEMI.Ctrlib.com/presentation" d:DataContext="{d:DesignInstance Type=editors:RecipeCommandViewModel}"
              mc:Ignorable="d" 
              Height="740" Width="1000" FontFamily="Segoe" >
     <Canvas>
@@ -148,7 +148,7 @@
                             <Border  BorderThickness="1" BorderBrush="Black" Width="110" Height="35" Margin="0,10,1,0" Background="{DynamicResource Table_BG_Title}">
                                 <Label Content="Loop Count:" VerticalContentAlignment="Center" HorizontalContentAlignment="Right"/>
                             </Border>
-                            <TextBox x:Name="SubRecipeLoopCount" Tag="Number" Text="{Binding SubRecipeLoopCount,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="190" Height="35" Margin="0,10,0,0"/>
+                            <controls:TextBoxEx x:Name="SubRecipeLoopCount" Tag="Number" Text="{Binding SubRecipeLoopCount,UpdateSourceTrigger=PropertyChanged}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" MinValue="0" MaxValue="999999" EditBoxMode="UnSignInteger"  Width="190" Height="35" Margin="0,10,0,0"/>
                         </StackPanel>
                     </StackPanel>
                 </Border>
@@ -179,7 +179,7 @@
                             </i:Interaction.Triggers>
                         </Button>
                         <TextBlock Width="40" Text="X" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-                        <TextBox  Tag="Number" Text="{Binding LoopCount,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="130"/>
+                        <controls:TextBoxEx  Tag="Number" Text="{Binding LoopCount,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MinValue="0" MaxValue="999999" EditBoxMode="UnSignInteger" Width="130"/>
                     </StackPanel>
                 </Border>
 

Furnace/FurnaceUI/Views/Recipes/RecipeLayoutEditViewModel.cs

@@ -1015,7 +1015,7 @@ namespace FurnaceUI.Views.Recipes
 
         public void EndEdit()
         {
-            RecipePermissionSelectViewModel dialog = new RecipePermissionSelectViewModel("Save recipe and permission", CurrentRecipe.RecipePermission);
+            RecipePermissionSelectViewModel dialog = new RecipePermissionSelectViewModel("Save recipe and permission", "",CurrentRecipe.Description);
             WindowManager wm = new WindowManager();
             bool? dialogReturn = wm.ShowDialog(dialog);
             if (!dialogReturn.HasValue || !dialogReturn.Value)
@@ -1084,7 +1084,7 @@ namespace FurnaceUI.Views.Recipes
             this.CurrentRecipe.Revisor = BaseApp.Instance.UserContext.LoginName;
             this.CurrentRecipe.ReviseTime = DateTime.Now;
             this.CurrentRecipe.RecipeLevel = this.LevelDisplay;
-            this.CurrentRecipe.RecipePermission = dialog.RecipePermission;
+            this.CurrentRecipe.Description = dialog.RecipeComment;
             this._recipeProvider.SaveRecipe(CurrentRecipe.PrefixPath, CurrentRecipe.Name, CurrentRecipe.GetXmlString());
             ((Window)GetView()).DialogResult = true;
         }

Furnace/FurnaceUI/Views/Recipes/RecipeProcessEditViewModel.cs

@@ -2631,10 +2631,10 @@ namespace FurnaceUI.Views.Recipes
             }
             if (CurrentRecipe.Steps != null && CurrentRecipe.Steps.Count > 0 && CheckValueChange(data))
             {
-                UpdateRecipeGASSetting(data);
+              //  UpdateRecipeGASSetting(data);
                 //SelectStep(CurrentRecipe.Steps[EditRecipeStepNo]);
             }
-            UpdateGASSetting();
+          //  UpdateGASSetting();
             oldresult = data;
             SetCmdIsEnabled();