jiangjy 1 week ago
parent
commit
35ce393bc9

+ 1 - 1
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -1294,7 +1294,7 @@ namespace FurnaceRT.Equipments.PMs
 
         private bool FsmRecipeAbort(object[] param)
         {
-            Singleton<EquipmentManager>.Instance.EndPj("Recipe Abort");
+            Singleton<EquipmentManager>.Instance.EndPj("AbnormalEnd");
             var firstPjId = Singleton<EquipmentManager>.Instance.GetFirstPJId();
             _processRoutine.UpdateProcessDataPJid(firstPjId);
             _processRoutine.Abort();

+ 1 - 0
Furnace/FurnaceUI/Views/Recipes/RecipeProcessEditViewModel.cs

@@ -1454,6 +1454,7 @@ namespace FurnaceUI.Views.Recipes
         public Step selectStep { get; set; } = new Step();
         public void StepEdit(string stepEditCmd)
         {
+            selectStep = SelectedRecipeStep;
             var windowManager = IoC.Get<IWindowManager>();
             switch (stepEditCmd)
             {

+ 6 - 2
Furnace/FurnaceUI/Views/Recipes/RecipeStepSelectDialogView.xaml

@@ -5,10 +5,14 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:FurnaceUI.Views.Recipes" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:cal="http://www.caliburn.org"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="300">
+            Height="470" Width="350">
+    <UserControl.Resources>
+        <Style BasedOn="{StaticResource ExScrollViewer}" TargetType="ScrollViewer" />
+        <Style BasedOn="{StaticResource ExScrollBar}" TargetType="ScrollBar" />
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="370"/>
+            <RowDefinition Height="420"/>
             <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
         <DataGrid Grid.ColumnSpan="2" AutoGenerateColumns="False" CanUserAddRows="False" CanUserResizeRows="False" CanUserSortColumns="False" ItemsSource="{Binding NewSteps,Mode=OneTime}">