From e4b44efc61133a217ddc89c2dfc83fde8325a905 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Tue, 16 May 2023 10:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=85=AE=E9=9D=A2=E6=9C=BA=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E7=89=88=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=92=8C=E7=85=AE=E9=9D=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=86=99=E5=85=A5=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs               |  18 ++-
 .../Model/MorksPar.cs                         |   1 +
 .../View/ParSet.xaml                          | 152 ++++++++++++++++--
 .../ViewModel/ParSetViewModel.cs              |  14 +-
 4 files changed, 166 insertions(+), 19 deletions(-)

diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
index ee6177cb..f0c793d8 100644
--- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
@@ -647,10 +647,20 @@ namespace BPASmartClient.MorkSUpgradedVer
                         if (mORKS.RBTakeNoodleTask.TryDequeue(out OrderLocInfo orderLocInfo))
                         {
                             //写入煮面时间
-                            List<ushort> values = new List<ushort>();
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
-                            values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
-                            WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                            //List<ushort> values = new List<ushort>();
+                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Minute);
+                            //values.Add(Json<MorksPar>.Data.parSets.ElementAt(loc).Second);
+                            //WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                            if (mORKS.CurrentFeedbackLoc >= 1 && mORKS.CurrentFeedbackLoc <= 5) {
+                                var x = Json<MorksPar>.Data.DishLibraryParSets.FirstOrDefault(p => p.TextBlockContext == mORKS.CurrentFeedbackLoc.ToString());
+                                if (x != null) {
+                                    List<ushort> values = new List<ushort>();
+                                    values.Add(x.Minute);
+                                    values.Add(x.Second);
+                                    WriteData($"VW{324 + (loc * 4)}", values.ToArray());
+                                    DeviceProcessLogShow($"转盘位置[{mORKS.CurrentFeedbackLoc}]：写入煮面时间{x.Minute}分{x.Second}秒。");
+                                }
+                            }
 
                             mORKS.CurrentLoc = 0;
                             mORKS.CookNodelId[loc] = orderLocInfo.SuborderId;
diff --git a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
index ef2c0cb5..4b50dfa5 100644
--- a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
+++ b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs
@@ -12,5 +12,6 @@ namespace BPASmartClient.MorkSUpgradedVer.Model
     internal class MorksPar
     {
         public ObservableCollection<ParSet> parSets { get; set; } = new ObservableCollection<ParSet>();
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = new ObservableCollection<ParSet>();
     }
 }
diff --git a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
index eb833a3a..d06c0166 100644
--- a/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
+++ b/BPASmartClient.MorkSUpgradedVer/View/ParSet.xaml
@@ -76,12 +76,13 @@
 
         <!--  参数放置面板  -->
         <Grid Grid.Row="2">
-            <ItemsControl ItemsSource="{Binding parSets}">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
-                            <TextBox
+            <StackPanel Orientation="Horizontal">
+                <ItemsControl ItemsSource="{Binding parSets}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="{Binding TextBlockContext}" />
+                                <TextBox
                                 Width="100"
                                 Margin="10,0,0,0"
                                 VerticalAlignment="Center"
@@ -92,8 +93,8 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Minute}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
-                            <TextBox
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（分）" />
+                                <TextBox
                                 Width="100"
                                 Margin="0,10"
                                 VerticalAlignment="Center"
@@ -104,9 +105,9 @@
                                 FontSize="21"
                                 Foreground="#ff34f7f7"
                                 Text="{Binding Second}" />
-                            <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
+                                <TextBlock Style="{StaticResource TextBlockStyle}" Text="（秒）" />
 
-                            <CheckBox
+                                <CheckBox
                                 Height="20"
                                 Margin="10"
                                 VerticalAlignment="Center"
@@ -117,10 +118,133 @@
                                 IsChecked="{Binding IsShield}"
                                 Template="{StaticResource CbTemplate}" />
 
-                        </StackPanel>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
+                            </StackPanel>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="50" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+                    <Grid 
+                    Grid.Row="0"
+                    Margin="100,10,0,0"
+                    Background="#ff0C255F">
+
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock
+                        Grid.Column="0"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="库位序号" />
+
+                        <TextBlock
+                        Grid.Column="1"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(分)" />
+
+                        <TextBlock
+                        Grid.Column="2"
+                        FontSize="24"
+                        Style="{StaticResource TitleTextblockStyle}"
+                        Text="煮时间(秒)" />
+
+                        <Border
+                        Grid.Column="0"
+                        Grid.ColumnSpan="4"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,1,1,1" />
+                        <Border
+                        Grid.Column="1"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+                        <Border
+                        Grid.Column="3"
+                        BorderBrush="{StaticResource bordColor}"
+                        BorderThickness="1,0,1,0" />
+
+
+                    </Grid>
+                    <Grid Grid.Row="1" Margin="100,0,0,0">
+                        <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                            <ItemsControl Foreground="DeepSkyBlue" ItemsSource="{Binding DishLibraryParSets}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Name="gr">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="157"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                            </Grid.ColumnDefinitions>
+
+                                            <TextBlock
+                                            Grid.Column="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontSize="18"
+                                            Text="{Binding TextBlockContext}" />
+
+                                            <!--<ComboBox
+                                            Grid.Column="1"
+                                            Height="auto"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            FontSize="18"
+                                            Foreground="DeepSkyBlue"
+                                            IsEditable="False"
+                                            ItemsSource="{Binding DataContext.DishTypeName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
+                                            SelectedIndex="{Binding LocDishType}" />-->
+
+                                            <Border
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="3"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,1"></Border>
+
+                                            <Border
+                                            Grid.Column="1"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="1"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Minute}" />
+                                            </Border>
+
+                                            <Border
+                                            Grid.Column="2"
+                                            BorderBrush="{StaticResource bordColor}"
+                                            BorderThickness="1,0,1,0">
+                                                <TextBox
+                                            Grid.Column="2"
+                                            FontSize="18"
+                                            Style="{StaticResource InputTextboxStyle}"
+                                            Text="{Binding Second}" />
+                                            </Border>
+                                        </Grid>
+
+                                        <DataTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="true">
+                                                <Setter TargetName="gr" Property="Background" Value="#112AB2E7" />
+                                            </Trigger>
+                                        </DataTemplate.Triggers>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </Grid>
+                </Grid>
+            </StackPanel>
+            
 
         </Grid>
 
diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
index 0aa320c6..03a8c2b4 100644
--- a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
+++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs
@@ -19,12 +19,24 @@ namespace BPASmartClient.MorkSUpgradedVer.ViewModel
             SaveInfoCommand = new RelayCommand(SaveSettingData);
 
             ActionManage.GetInstance.Register(SaveSettingData, "初始化设定煮面时间");
-            
+
+            if (Json<MorksPar>.Data.DishLibraryParSets.Count < 5) {
+                Json<MorksPar>.Data.DishLibraryParSets.Clear();
+                for (int i = 0; i < 5; i++) {
+                    Json<MorksPar>.Data.DishLibraryParSets.Add(new ParSet() {
+                        Minute = 2,
+                        Second = 0,
+                        TextBlockContext = $"{i + 1}"
+                    });
+                }
+            }
+
         }
 
         public RelayCommand SaveInfoCommand { get; set; }
 
         public ObservableCollection<ParSet> parSets { get; set; } = Json<MorksPar>.Data.parSets;
+        public ObservableCollection<ParSet> DishLibraryParSets { get; set; } = Json<MorksPar>.Data.DishLibraryParSets;
 
         private void SaveSettingData()
         {