From ad5f4d86bb77e4f7614cea21cd2526a1aad1c0e4 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Sat, 6 Jul 2024 15:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E5=86=B0=E7=AE=B1=E6=8A=BD?=
 =?UTF-8?q?=E5=B1=89=EF=BC=8Chome=E9=A1=B5=E9=9D=A2=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=AF=A5=E5=80=BC=E6=98=BE=E7=A4=BA=E4=B8=8E=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E5=86=B0=E7=AE=B1=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                             |  5 ++++-
 DM_Weight/Converter/BoardTypeConverter.cs        | 13 -------------
 DM_Weight/ViewModels/HomeWindowViewModel.cs      |  5 +++++
 DM_Weight/ViewModels/OrderTakeDialogViewModel.cs |  5 ++---
 DM_Weight/Views/HomeWindow.xaml                  |  2 +-
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 2b61571..b7bd7a1 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -57,6 +57,10 @@
 		<add key="CanBusPortPath" value="COM3" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM8" />
+		
+		
+		<!--是否有冰箱抽屉0无1有-->
+		<add key="hasFridge" value="1"/>
 		<!-- 冰箱的串口号 -->
 		<add key="FridgePortPath" value="COM7" />
 
@@ -80,7 +84,6 @@
 		<add key="AlarmState2" value="0"/>
 		
 		
-		
 		<!-- 抽屉串口的串口号 --><!--
 		<add key="DrawerPortPath" value="COM11" />
 		--><!-- can总线串口的串口号 --><!--
diff --git a/DM_Weight/Converter/BoardTypeConverter.cs b/DM_Weight/Converter/BoardTypeConverter.cs
index 92a0c24..54e5382 100644
--- a/DM_Weight/Converter/BoardTypeConverter.cs
+++ b/DM_Weight/Converter/BoardTypeConverter.cs
@@ -94,19 +94,6 @@ namespace DM_Weight.Converter
                     {
                         return "计数回收(外置)";
                     }
-                case 35:
-                    if (DrawerType == 1)
-                    {
-                        return "药盒智能显示";
-                    }
-                    else if (DrawerType == 2)
-                    {
-                        return "药盒智能显示回收(内置)";
-                    }
-                    else
-                    {
-                        return "药盒智能显示回收(外置)";
-                    }
             }
             return "";
         }
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 8c4a784..e4099ca 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -43,6 +43,11 @@ namespace DM_Weight.ViewModels
         public string WD { get => _wd; set => SetProperty(ref _wd, value); }
         System.Timers.Timer WDTimer;
 
+        /// <summary>
+        /// 是否有冰箱抽屉
+        /// </summary>
+        private string hasFridge= ConfigurationManager.AppSettings["hasFridge"].ToString().Equals("1")? "Visible" : "Collapsed";
+        public string HasFridge { get => hasFridge; set => SetProperty(ref hasFridge,value); }
 
         private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
         public bool MultiLogin
diff --git a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
index 0b31572..e290581 100644
--- a/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDialogViewModel.cs
@@ -452,9 +452,8 @@ namespace DM_Weight.ViewModels
                         if (f.Data)
                         {
                             // 更新屏显库存
-                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
-                            //if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
-                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1).ToString().Contains("5"))
+                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType == 5);
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == 5)
                             {
                                 singleChannels.ForEach(it =>
                                 {
diff --git a/DM_Weight/Views/HomeWindow.xaml b/DM_Weight/Views/HomeWindow.xaml
index 31924c1..c7d93ec 100644
--- a/DM_Weight/Views/HomeWindow.xaml
+++ b/DM_Weight/Views/HomeWindow.xaml
@@ -119,7 +119,7 @@
                 <StackPanel Margin="6" Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button Content="储物箱" Command="{Binding OpenRecoverCommand}" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignFlatSecondaryLightButton}" />
                     <!--<TextBlock Margin="0,10,10,0" Text="{Binding WD}" Foreground="White" FontWeight="Bold" FontSize="14"/>-->
-                    <Button Content="查看冰箱温度" Command="{Binding CheckWDCommand}" Style="{StaticResource MaterialDesignFlatSecondaryLightButton}"/>
+                    <Button Content="查看冰箱温度"  Visibility="{Binding HasFridge}" Command="{Binding CheckWDCommand}" Style="{StaticResource MaterialDesignFlatSecondaryLightButton}"/>
                 </StackPanel>
             </Grid>