From e2a02e06671a2cbb4c7489e04c2206c4aa7265f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 20 May 2023 14:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.MorkS/Model/MorksPar.cs | 20 +-
BPASmartClient.MorkS/View/ParSet.xaml | 524 +++++++++---------
.../ViewModel/ParSetViewModel.cs | 51 +-
3 files changed, 325 insertions(+), 270 deletions(-)
diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs
index 61a8f21c..2e53c17f 100644
--- a/BPASmartClient.MorkS/Model/MorksPar.cs
+++ b/BPASmartClient.MorkS/Model/MorksPar.cs
@@ -16,12 +16,30 @@ namespace BPASmartClient.MorkS.Model
///
/// 加汤时间，单位秒
///
- public float AddSoupTime { get; set; } = 2;
+ public ushort AddSoupTime { get; set; } = 2;
+
///
/// 倒面条件 煮面口忙碌数量
///
public int InvertedNoodles_OpenBusyNum { get; set; } = 5;
+ ///
+ /// 间隔时间设定
+ ///
+ public ushort IntervalTime { get; set; }
+ ///
+ /// 反转抽汤时间设定
+ ///
+ public ushort BackwardSoupSootTime { get; set; }
+ ///
+ /// 反转过后再次出汤时间设定
+ ///
+ public ushort BackwardedOutSoupTime { get; set; }
+ ///
+ /// 未反转抽汤下时间设定
+ ///
+ public ushort UnBackwardSoupSootTime { get; set; }
+
public ObservableCollection DishLibraryParSets { get; set; } = new ObservableCollection();
}
}
diff --git a/BPASmartClient.MorkS/View/ParSet.xaml b/BPASmartClient.MorkS/View/ParSet.xaml
index 615872fe..d816dc69 100644
--- a/BPASmartClient.MorkS/View/ParSet.xaml
+++ b/BPASmartClient.MorkS/View/ParSet.xaml
@@ -13,7 +13,7 @@
mc:Ignorable="d">
-
+
@@ -78,53 +78,53 @@
-
-
-
+
+
+
-
+
+ Width="100"
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ Background="Transparent"
+ BorderBrush="#FF23CACA"
+ CaretBrush="Aqua"
+ FontFamily="楷体"
+ FontSize="21"
+ Foreground="#ff34f7f7"
+ Text="{Binding Minute}" />
+ Width="100"
+ Margin="0,10"
+ VerticalAlignment="Center"
+ Background="Transparent"
+ BorderBrush="#FF23CACA"
+ CaretBrush="Aqua"
+ FontFamily="楷体"
+ FontSize="21"
+ Foreground="#ff34f7f7"
+ Text="{Binding Second}" />
+ Height="20"
+ Margin="10"
+ VerticalAlignment="Center"
+ Background="#FF2AB2E7"
+ Content="{Binding CheckBoxContext}"
+ FontSize="14"
+ Foreground="#00c2f4"
+ IsChecked="{Binding IsShield}"
+ Template="{StaticResource CbTemplate}" />
@@ -136,10 +136,10 @@
-
+
@@ -148,36 +148,36 @@
+ Grid.Column="0"
+ FontSize="24"
+ Style="{StaticResource TitleTextblockStyle}"
+ Text="库位序号" />
+ Grid.Column="1"
+ FontSize="24"
+ Style="{StaticResource TitleTextblockStyle}"
+ Text="煮时间(分)" />
+ Grid.Column="2"
+ FontSize="24"
+ Style="{StaticResource TitleTextblockStyle}"
+ Text="煮时间(秒)" />
+ Grid.Column="0"
+ Grid.ColumnSpan="4"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,1,1,1" />
+ Grid.Column="1"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,0,1,0" />
+ Grid.Column="3"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,0,1,0" />
@@ -188,17 +188,17 @@
-
-
-
+
+
+
+ Grid.Column="0"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ FontSize="18"
+ Text="{Binding TextBlockContext}" />
-
+ Grid.Column="0"
+ Grid.ColumnSpan="3"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,0,1,1" />
+
+ Grid.Column="1"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,0,1,0">
+ Grid.Column="1"
+ FontSize="18"
+ Style="{StaticResource InputTextboxStyle}"
+ Text="{Binding Minute}" />
-
+
+ Grid.Column="2"
+ BorderBrush="{StaticResource bordColor}"
+ BorderThickness="1,0,1,0">
+ Grid.Column="2"
+ FontSize="18"
+ Style="{StaticResource InputTextboxStyle}"
+ Text="{Binding Second}" />
@@ -252,183 +252,202 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="清洗加汤管道时间:" />
+
+
-
-
+
+
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="倒面条件，煮面口使用数量:" />
+ Width="100"
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ Background="Transparent"
+ BorderBrush="#FF23CACA"
+ CaretBrush="Aqua"
+ FontFamily="楷体"
+ FontSize="21"
+ Foreground="#ff34f7f7"
+ Text="{Binding OpenUseNumber, UpdateSourceTrigger=PropertyChanged}" />
+ Margin="10,0,0,0"
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="(个)" />
-
-
+
+
+
+ Margin="10,0,0,0"
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="反转间隔时间设定:" />
+ Width="100"
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ Background="Transparent"
+ BorderBrush="#FF23CACA"
+ CaretBrush="Aqua"
+ FontFamily="楷体"
+ FontSize="21"
+ Foreground="#ff34f7f7"
+ Text="{Binding IntervalTime, UpdateSourceTrigger=PropertyChanged}" />
+ Margin="10,0,0,0"
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="(秒)" />
-
-
+
+
+ Margin="10,0,0,0"
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="反转抽汤时间设定:" />
+ Width="100"
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ Background="Transparent"
+ BorderBrush="#FF23CACA"
+ CaretBrush="Aqua"
+ FontFamily="楷体"
+ FontSize="21"
+ Foreground="#ff34f7f7"
+ Text="{Binding BackwardSoupSootTime, UpdateSourceTrigger=PropertyChanged}" />
+
+
+
+
+
+
+
+
+
+
+
+
+ Margin="10,0,0,0"
+ FontSize="21"
+ Style="{StaticResource TextBlockStyle}"
+ Text="(秒)" />
-
-
+
+
+
diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
index 90092641..fa396d5a 100644
--- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs
@@ -19,7 +19,7 @@ namespace BPASmartClient.MorkS.ViewModel
public ParSetViewModel()
{
SaveInfoCommand = new RelayCommand(SaveSettingData);
- SoupSootForwardCommand=new RelayCommand(SoupSootForward);
+ SoupSootForwardCommand = new RelayCommand(SoupSootForward);
SoupSootBackwardCommand = new RelayCommand(SoupSootBackward);
SoupSootStopCommand = new RelayCommand(SoupSootStop);
@@ -27,7 +27,7 @@ namespace BPASmartClient.MorkS.ViewModel
ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
- CommandStart = new RelayCommand(async ()=>
+ CommandStart = new RelayCommand(async () =>
{
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M0.6", Value = true });
await Task.Delay((int)DelayTime * 1000);
@@ -58,34 +58,31 @@ namespace BPASmartClient.MorkS.ViewModel
public RelayCommand SoupSootForwardCommand { get; set; }
public RelayCommand SoupSootBackwardCommand { get; set; }
public RelayCommand SoupSootStopCommand { get; set; }
+
#region 时间设定
///
/// 间隔时间设定
///
- public float IntervalTime { get { return _IntervalTime; } set { _IntervalTime = value; OnPropertyChanged(); } }
- private float _IntervalTime;
+ public ushort IntervalTime { get { return Json.Data.IntervalTime; } set { Json.Data.IntervalTime = value; OnPropertyChanged(); } }
///
/// 反转抽汤时间设定
///
- public float BackwardSoupSootTime { get { return _BackwardSoupSootTime; } set { _BackwardSoupSootTime = value; OnPropertyChanged(); } }
- private float _BackwardSoupSootTime;
+ public ushort BackwardSoupSootTime { get { return Json.Data.BackwardSoupSootTime; } set { Json.Data.BackwardSoupSootTime = value; OnPropertyChanged(); } }
///
/// 反转过后再次出汤时间设定
///
- public float BackwardedOutSoupTime { get { return _BackwardedOutSoupTime; } set { _BackwardedOutSoupTime = value; OnPropertyChanged(); } }
- private float _BackwardedOutSoupTime;
+ public ushort BackwardedOutSoupTime { get { return Json.Data.BackwardedOutSoupTime; } set { Json.Data.BackwardedOutSoupTime = value; OnPropertyChanged(); } }
///
/// 未反转抽汤下时间设定
///
- public float UnBackwardSoupSootTime { get { return _UnBackwardSoupSootTime; } set { _UnBackwardSoupSootTime = value; OnPropertyChanged(); } }
- private float _UnBackwardSoupSootTime;
+ public ushort UnBackwardSoupSootTime { get { return Json.Data.UnBackwardSoupSootTime; } set { Json.Data.UnBackwardSoupSootTime = value; OnPropertyChanged(); } }
//public RelayCommand VoicePlayTest { get; set; }
///
/// 加汤时间设置
///
- public float AddSoup { get { return Json.Data.AddSoupTime; } set { Json.Data.AddSoupTime = value; OnPropertyChanged(); } }
+ //public ushort AddSoup { get { return Json.Data.AddSoupTime; } set { Json.Data.AddSoupTime = value; OnPropertyChanged(); } }
#endregion
@@ -114,33 +111,43 @@ namespace BPASmartClient.MorkS.ViewModel
bools.Add(Json.Data.parSets[i].IsShield);
ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = $"VW{116 + (i * 6)}", Value = values.ToArray() });
}
- ushort times = Convert.ToUInt16(Json.Data.AddSoupTime * 10);
- ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
+ //ushort times = Convert.ToUInt16(Json.Data.AddSoupTime * 10);
+ //ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = times });
+
+ ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = (ushort)(UnBackwardSoupSootTime * 10) });
+ ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2284", Value = (ushort)(IntervalTime * 10) });
+ ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2286", Value = (ushort)(BackwardSoupSootTime * 10) });
+ ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2288", Value = (ushort)(BackwardedOutSoupTime * 10) });
+
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M260.0", Value = bools.ToArray() });
Json.Save();
- WriteTimeSet(IntervalTime);
- WriteTimeSet(BackwardSoupSootTime);
- WriteTimeSet(BackwardedOutSoupTime);
- WriteTimeSet(UnBackwardSoupSootTime);
+ //WriteTimeSet(IntervalTime);
+ //WriteTimeSet(BackwardSoupSootTime);
+ //WriteTimeSet(BackwardedOutSoupTime);
+ //WriteTimeSet(UnBackwardSoupSootTime);
}
- private void WriteTimeSet(float TimePar) {
+ private void WriteTimeSet(float TimePar)
+ {
ushort paras = Convert.ToUInt16(TimePar * 10);
ActionManage.GetInstance.Send("WriteVW", new WritePar() { Address = "VW2282", Value = paras });
}
-
- private async void SoupSootForward() {
+
+ private async void SoupSootForward()
+ {
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = true });
await Task.Delay((int)DelayTime * 1000);
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.0", Value = false });
}
- private async void SoupSootBackward() {
+ private async void SoupSootBackward()
+ {
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = true });
await Task.Delay((int)DelayTime * 1000);
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.1", Value = false });
}
- private async void SoupSootStop() {
+ private async void SoupSootStop()
+ {
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = true });
await Task.Delay((int)DelayTime * 1000);
ActionManage.GetInstance.Send("WriteBools", new WritePar() { Address = "M1.2", Value = false });