revise res recipe bug

PunkHPX8_MainPages/ViewModels/ResRecipeViewModel.cs

@@ -182,11 +182,6 @@ namespace PunkHPX8_MainPages.ViewModels
             PropertyValidResultDic["ANFlowRateErrorLow"] = false;
             PropertyValidResultDic["ANFlowRateWarningLow"] = false;
             PropertyValidResultDic["ANFlowSetPoint"] = false;
-            PropertyValidResultDic["ANLevelErrorHigh"] = false;
-            PropertyValidResultDic["ANLevelErrorLow"] = false;
-            PropertyValidResultDic["ANLevelWarningLow"] = false;
-
-            PropertyValidResultDic["ReservoirANLevel"] = false;
 
 
 
@@ -313,57 +308,6 @@ namespace PunkHPX8_MainPages.ViewModels
                     if (!CheckNameExist(recipeNameDialog.RecipeName))
                     {
                         recipe = new ResRecipe();
-
-                        //recipe.IdleTime = Recipe.IdleTime;
-                        //recipe.Charge = Recipe.Charge;
-                        //recipe.Cycles = Recipe.Cycles;
-                        //recipe.StartTime = Recipe.StartTime;
-                        //recipe.ChemistryVendor = Recipe.ChemistryVendor;
-                        //recipe.Metal = Recipe.Metal;
-                        //recipe.DIReplenEnable = Recipe.DIReplenEnable;
-                        //recipe.DIReplenTimeRate = Recipe.DIReplenTimeRate;
-                        //recipe.DIReplenCurrentRate = Recipe.DIReplenCurrentRate;
-                        //recipe.PHErrorLow = Recipe.PHErrorLow;
-                        //recipe.PHErrorHigh = Recipe.PHErrorHigh;
-                        //recipe.CALevelErrorHigh = Recipe.CALevelErrorHigh;
-                        //recipe.CALevelErrorLow = Recipe.CALevelErrorLow;
-                        //recipe.ReservoirCALevel = Recipe.ReservoirCALevel;
-                        //recipe.CAFlowSetPoint = Recipe.CAFlowSetPoint;
-                        //recipe.CAFlowRateWarningLow = Recipe.CAFlowRateWarningLow;
-                        //recipe.CAFlowRateErrorLow = Recipe.CAFlowRateErrorLow;
-                        //recipe.IdleFlowEnable = Recipe.IdleFlowEnable;
-                        //recipe.TemperatureErrorHigh = Recipe.TemperatureErrorHigh;
-                        //recipe.TemperatureErrorLow = Recipe.TemperatureErrorLow;
-                        //recipe.TemperatureSetPoint = Recipe.TemperatureSetPoint;
-                        //recipe.TemperatureWarningHigh = Recipe.TemperatureWarningHigh;
-                        //recipe.TemperatureWarningLow = Recipe.TemperatureWarningLow;
-                        //recipe.ANDIReplenEnable = Recipe.ANDIReplenEnable;
-                        //recipe.ANDIReplenCurrentRate = Recipe.ANDIReplenCurrentRate;
-                        //recipe.ANDIReplenTimeRate = Recipe.ANDIReplenTimeRate;
-                        //recipe.ANFlowRateErrorLow = Recipe.ANFlowRateErrorLow;
-                        //recipe.ANFlowRateWarningLow = Recipe.ANFlowRateWarningLow;
-                        //recipe.ANFlowSetPoint = Recipe.ANFlowSetPoint;
-                        //recipe.ANLevelErrorHigh = Recipe.ANLevelErrorHigh;
-                        //recipe.ANLevelErrorLow = Recipe.ANLevelErrorLow;
-                        //recipe.ANLevelWarningLow = Recipe.ANLevelWarningLow;
-                        //recipe.ReservoirANLevel = Recipe.ReservoirANLevel;
-                        //recipe.CrossDoseCurrentRate = Recipe.CrossDoseCurrentRate;
-                        //recipe.CrossDoseTimeRate = Recipe.CrossDoseTimeRate;
-                        //recipe.CurrentBased = Recipe.CurrentBased;
-                        //recipe.TimeBased = Recipe.TimeBased;
-                        //recipe.BurnInEnable = Recipe.BurnInEnable;
-                        //recipe.BurnInTime = Recipe.BurnInTime;
-                        //recipe.BurnInCurrent = Recipe.BurnInCurrent;
-                        //recipe.BurnInCycles = Recipe.BurnInCycles;
-                        //recipe.BurnInCurrentLimitEnable = Recipe.BurnInCurrentLimitEnable;
-                        //recipe.BurnInMinCurrentLimit = Recipe.BurnInMinCurrentLimit;
-                        //recipe.CMMEnable = Recipe.CMMEnable;
-                        //recipe.CMMCurrentSetPoint = Recipe.CMMCurrentSetPoint;
-                        //recipe.CMMCurrentFaultPercent = Recipe.CMMCurrentFaultPercent;
-                        //recipe.CMMCurrentWarningPercent = Recipe.CMMCurrentWarningPercent;
-                        //recipe.CMMMinVoltage = Recipe.CMMMinVoltage;
-
-                        //recipe.BurnInStartTime = Recipe.BurnInStartTime; //值类型，不影响Recipe
                         recipe = (ResRecipe)PropertyUtil.Clone(Recipe);
 
                         recipe.CreateDate = DateTime.Now;
@@ -421,13 +365,11 @@ namespace PunkHPX8_MainPages.ViewModels
                     bool result = false;
                     switch (key)
                     { 
-                        case "ANLevelErrorHigh":
-                            result = true; break;
-                        case "ANLevelErrorLow":
+                        case "ANFlowRateErrorLow":
                             result = true; break;
-                        case "ANLevelWarningLow":
+                        case "ANFlowRateWarningLow":
                             result = true; break;
-                        case "ReservoirANLevel":
+                        case "ANFlowSetPoint":
                             result = true; break;
                         case "ANDIReplenTimeRate":
                             result = true; break;

PunkHPX8_MainPages/Views/ResRecipeView.xaml

@@ -245,9 +245,9 @@
                                             <ColumnDefinition Width="220"></ColumnDefinition>
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
-                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="0" Title="AN Flow Set Point" Unit="L/min" MinValue="0" MaxValue="150" DigitalValue="{Binding Recipe.ANFlowSetPoint,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowSetPoint],Mode=TwoWay}" Width="220"/>
-                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="1" Title="AN Flow Rate Warning Low" Unit="L/min" MinValue="0" MaxValue="150" DigitalValue="{Binding Recipe.ANFlowRateWarningLow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowRateWarningLow],Mode=TwoWay}" Width="220"/>
-                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="2" Title="AN Flow Rate Error Low" Unit="L/min" MinValue="0" MaxValue="150" DigitalValue="{Binding Recipe.ANFlowRateErrorLow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowRateErrorLow],Mode=TwoWay}" Width="220"/>
+                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="0" Title="AN Flow Set Point" Unit="L/min" MinValue="0" MaxValue="1.5" DigitalValue="{Binding Recipe.ANFlowSetPoint,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowSetPoint],Mode=TwoWay}" Width="220"/>
+                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="1" Title="AN Flow Rate Warning Low" Unit="L/min" MinValue="0" MaxValue="1.5" DigitalValue="{Binding Recipe.ANFlowRateWarningLow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowRateWarningLow],Mode=TwoWay}" Width="220"/>
+                                        <UserControls:GroupDigitalBoxControl Grid.Column="0" Grid.Row="2" Title="AN Flow Rate Error Low" Unit="L/min" MinValue="0" MaxValue="1.5" DigitalValue="{Binding Recipe.ANFlowRateErrorLow,Mode=TwoWay}" ValidResult="{Binding PropertyValidResultDic[ANFlowRateErrorLow],Mode=TwoWay}" Width="220"/>
                                     </Grid>
                                 </GroupBox>
                             </Grid>

PunkHPX8_RT/Config/Layout/ToolLayoutConfiguration.xml

@@ -375,7 +375,7 @@
 			<PermittedWaferSizeInMM>200</PermittedWaferSizeInMM>
 			<ResourceID>Dummy1</ResourceID>
 			<Type>Dummy</Type>
-			<MaxNumberOfSlots>3</MaxNumberOfSlots>
+			<MaxNumberOfSlots>6</MaxNumberOfSlots>
 			<DummyCassetteID>1</DummyCassetteID>
 		</Item>
 		<Item i:type="DummyCassette">
@@ -383,7 +383,7 @@
 			<PermittedWaferSizeInMM>200</PermittedWaferSizeInMM>
 			<ResourceID>Dummy1</ResourceID>
 			<Type>Dummy</Type>
-			<MaxNumberOfSlots>3</MaxNumberOfSlots>
+			<MaxNumberOfSlots>6</MaxNumberOfSlots>
 			<DummyCassetteID>2</DummyCassetteID>
 		</Item>