fix 添加弹出创建foup操作

Furnace/FurnaceRT/Equipments/Systems/EquipmentManager.cs

@@ -1545,13 +1545,16 @@ namespace FurnaceRT.Equipments.Systems
             ModuleName chamber = ModuleHelper.Converter(args[0].ToString());
             int slot = (int)args[1];
             CarrierType carrierTye = GetStockerType(chamber.ToString());
-
+            bool isCheckType = true;
 
             if (args.Length > 2)
             {
-
+                if (args.Length >3)
+                {
+                    isCheckType = bool.Parse(args[3].ToString());
+                }
                 var inputType = args[2].ToString();
-                if (!carrierTye.ToString().Equals(CarrierType.None.ToString()) && !carrierTye.ToString().Equals(inputType))
+                if (!carrierTye.ToString().Equals(CarrierType.None.ToString()) && !carrierTye.ToString().Equals(inputType)&& isCheckType)
                 {
                     EV.PostInfoLog(Module, $"{chamber} type mismatch!");
                     return false;

Furnace/FurnaceUI/Views/Operations/TransferMain/CassetteModifyView.xaml

@@ -51,7 +51,37 @@
                 </StackPanel>
             </Border>
             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.ColumnSpan="2" Padding="5,1">
-                <StackPanel   Orientation="Horizontal" >
+                <UniformGrid Columns="4">
+                    <Button Content="Create Carrier" Width="120" Height="25" IsEnabled="{Binding IsEnableWaferManualOperation}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="CreateCarrier"></cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Button Content="Delete Carrier" Width="120" Height="25" IsEnabled="{Binding IsEnableWaferManualOperation}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="DeleteCarrier"></cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Button Content="Create Wafer" Width="120" Height="25" IsEnabled="{Binding IsEnableWaferManualOperation}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="CreateWafer"></cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Button Content="Delete Wafer" Width="120" Height="25" IsEnabled="{Binding IsEnableWaferManualOperation}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="DeleteWafer"></cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </UniformGrid>
+                <!--<StackPanel   Orientation="Horizontal" >
                     <Button Content="Create Wafer" Width="120" Height="25" Margin="105,0,0,0" IsEnabled="{Binding IsEnableWaferManualOperation}">
                         <i:Interaction.Triggers>
                             <i:EventTrigger EventName="Click">
@@ -66,7 +96,8 @@
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
                     </Button>
-                </StackPanel>
+                    
+                </StackPanel>-->
             </Border>
         </Grid>
         <DataGrid AlternationCount="2" HorizontalAlignment="Left" CanUserAddRows="False" AutoGenerateColumns="False" RowHeaderWidth="0"
@@ -76,7 +107,7 @@
                 <DataGridTemplateColumn Header="Slot" Width="100">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBlock Text="{Binding SlotID}" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
+                            <TextBlock Text="{Binding SlotID}" Margin="5,0" FontFamily="Arial" FontSize="14"   Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>

Furnace/FurnaceUI/Views/Operations/TransferMain/CassetteModifyViewModel.cs

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using FurnaceUI.Models;
 using MECF.Framework.Common.SubstrateTrackings;
+using Aitex.Core.RT.SCCore;
 
 namespace FurnaceUI.Views.Operations
 {
@@ -254,9 +255,45 @@ namespace FurnaceUI.Views.Operations
                 return;
             }
 
-            InvokeClient.Instance.Service.DoOperation("CreateWafer", $"{ModuleName}", CassetteSlot-1, waferType.ToString(), OriginSelectModule, OriginSlot-1);
+            InvokeClient.Instance.Service.DoOperation("CreateWafer", $"{ModuleName}", CassetteSlot - 1, waferType.ToString(), OriginSelectModule, OriginSlot - 1);
         }
+        public void CreateCarrier()
+        {
+            WaferType waferType = WaferType.None;
+            if (SDIsChecked)
+                waferType = WaferType.SD;
+            else if (EDIsChecked)
+                waferType = WaferType.ED;
+            else if (PIsChecked)
+                waferType = WaferType.P;
+            //else if (MIsChecked)
+            //    waferType = WaferType.M; 
+            else if (M1IsChecked)
+                waferType = WaferType.M1;
+            else if (M2IsChecked)
+                waferType = WaferType.M2;
+            else if (XDIsChecked)
+                waferType = WaferType.XD;
+            else if (TIsChecked)
+                waferType = WaferType.T;
+
 
+            InvokeClient.Instance.Service.DoOperation("System.CreateCarrier", $"{ModuleName}", 1, waferType.ToString(), false.ToString());
+        }
+        public void DeleteCarrier()
+        {
+            InvokeClient.Instance.Service.DoOperation("System.DeleteCarrier", $"{ModuleName}", 1);
+            foreach (var item in CassetteWaferInfoItems)
+            {
+                item.SourceName = "";
+                item.WaferStatus = 0;
+                item.WaferType = "";
+                item.UseCount = "";
+                item.UseTime = "";
+                item.UseThick = "";
+                item.MappingResult = ScanResult.Init;
+            }
+        }
 
         public void DeleteWafer()
         {