From c5fcd12bec06b609ba09bf27f11728a108727912 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 2 Sep 2024 10:15:49 +0800
Subject: [PATCH] change.

---
 SlnMesnac.Config/DebugConfig.cs                     | 10 ++++++++++
 SlnMesnac.WPF/Model/RecipeManageCache.cs            | 11 +++++++++++
 SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs           |  2 +-
 SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml    |  6 ++++--
 SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs | 10 ++++++----
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/SlnMesnac.Config/DebugConfig.cs b/SlnMesnac.Config/DebugConfig.cs
index d62e7f0..613e006 100644
--- a/SlnMesnac.Config/DebugConfig.cs
+++ b/SlnMesnac.Config/DebugConfig.cs
@@ -44,6 +44,16 @@ namespace SlnMesnac.Config
             set { iniHelper.IniWriteValue("system", "MaxBufferWeight", value); }
         }
 
+        /// <summary>
+        ///2楼缓存区最小启动重量
+        /// </summary>
+        public string MinBufferWeight
+        {
+            get { return iniHelper.IniReadValue("system", "MinBufferWeight"); }
+            set { iniHelper.IniWriteValue("system", "MinBufferWeight", value); }
+        }
+
+
         /// <summary>
         ///系统当前使用配方模版
         /// </summary>
diff --git a/SlnMesnac.WPF/Model/RecipeManageCache.cs b/SlnMesnac.WPF/Model/RecipeManageCache.cs
index adf0fb4..874c428 100644
--- a/SlnMesnac.WPF/Model/RecipeManageCache.cs
+++ b/SlnMesnac.WPF/Model/RecipeManageCache.cs
@@ -100,6 +100,17 @@ namespace SlnMesnac.WPF.Model
         }
 
 
+        /// <summary>
+        /// 2楼缓存区最小启动重量
+        /// </summary>
+        public double MinBufferWeight
+        {
+            get { return double.Parse(config.MinBufferWeight); }
+            set { config.MinBufferWeight = value.ToString(); }
+        }
+
+
+
         /// <summary>
         /// 当前使用模版名称
         /// </summary>
diff --git a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
index 8a147e7..5cdb82b 100644
--- a/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
+++ b/SlnMesnac.WPF/Page/DevMonitorPage.xaml.cs
@@ -1333,7 +1333,7 @@ namespace SlnMesnac.WPF.Page
                     Thread.Sleep(MachineSleep);
                     result = plc.readBoolByAddress(baseBusiness.GetPlcAddressByConfigKey("螺旋2启动"));
                 }
-
+                
             }
             catch (Exception ex)
             {
diff --git a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml
index fe3a6c8..eea79ee 100644
--- a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml
+++ b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml
@@ -5,19 +5,21 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:SlnMesnac.WPF.Page"
         mc:Ignorable="d"
-        Title="重量设置" Height="300" Width="700" WindowStartupLocation="CenterScreen"  Background="#73B0F5">
+        Title="重量设置" Height="300" Width="900" WindowStartupLocation="CenterScreen"  Background="#73B0F5">
     <Border Margin="5" Background="Transparent" CornerRadius="10">
         <Border.Effect>
             <DropShadowEffect Color="LightGoldenrodYellow" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
         </Border.Effect>
         <Grid>
             <StackPanel  VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
+                <TextBlock Text="最小重量阈值:" FontSize="25" VerticalAlignment="Center" Width="200" Margin="0,0,20,0" Foreground="Black" HorizontalAlignment="Left"/>
+                <TextBox  x:Name="MinWeightTxt"  Width="100" FontSize="25"  VerticalAlignment="Center" Margin="0,0,20,0" Foreground="Black" BorderThickness="3" BorderBrush="Black"/>
                 <TextBlock Text="最大重量阈值:" FontSize="25" VerticalAlignment="Center" Width="200" Margin="0,0,20,0" Foreground="Black" HorizontalAlignment="Left"/>
                 <TextBox  x:Name="MaxWeightTxt"  Width="100" FontSize="25"  VerticalAlignment="Center" Margin="0,0,20,0" Foreground="Black" BorderThickness="3" BorderBrush="Black"/>
                 <Button  x:Name="MaxWeightChangeButton" Style="{StaticResource  BUTTON_AGREE}"  Content="数量调整"  FontSize="30" Background="Green" Width="180"  Height="60"  Margin="0 0 20 0" HorizontalAlignment="Left" Click="MaxWeightChangeButton_Click" />
             </StackPanel>
             <StackPanel    Margin="80 150 0 0" VerticalAlignment="Center" >
-                <TextBlock Text="提示信息:  缓存区重量超过该值，设备将会停止！" FontSize="25" Width="600" Margin="0,0,20,0" Foreground="Yellow" HorizontalAlignment="Left"/>
+                <TextBlock Text="提示信息:  缓存区重量超过最大值，设备将会自动停止！" FontSize="25" Width="600" Margin="0,0,20,0" Foreground="Yellow" HorizontalAlignment="Left"/>
                 
             </StackPanel>
         </Grid>
diff --git a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
index 3399dab..7c8a6cf 100644
--- a/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
+++ b/SlnMesnac.WPF/Page/Window/InputDialogWindow.xaml.cs
@@ -35,13 +35,15 @@ namespace SlnMesnac.WPF.Page
             InitializeComponent();
             MaxWeightTxt.Text = recipeManageCache.MaxBufferWeight.ToString();
         }
-
+     
         private void MaxWeightChangeButton_Click(object sender, RoutedEventArgs e)
         {
-           bool flag =  double.TryParse(MaxWeightTxt.Text,out double result);
-            if (flag)
+           bool flag =  double.TryParse(MaxWeightTxt.Text,out double maxValue);
+           bool flag2 =  double.TryParse(MinWeightTxt.Text,out double minValue);
+            if (flag&&flag2)
             {
-                recipeManageCache.MaxBufferWeight = result;
+                recipeManageCache.MaxBufferWeight = maxValue;
+
             }
             else
             {