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); } } + /// + ///2楼缓存区最小启动重量 + /// + public string MinBufferWeight + { + get { return iniHelper.IniReadValue("system", "MinBufferWeight"); } + set { iniHelper.IniWriteValue("system", "MinBufferWeight", value); } + } + + /// ///系统当前使用配方模版 /// 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 } + /// + /// 2楼缓存区最小启动重量 + /// + public double MinBufferWeight + { + get { return double.Parse(config.MinBufferWeight); } + set { config.MinBufferWeight = value.ToString(); } + } + + + /// /// 当前使用模版名称 /// 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"> + +