From 00637067d3c3ec29712533a53f01151a7d2b14b0 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 24 Dec 2024 10:19:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=8A=BD=E5=B1=89=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=88=87=E6=8D=A2=E8=8F=9C=E5=8D=95=EF=BC=9B?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E5=8A=A0=E8=8D=AF=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs |  4 ++--
 DM_Weight/ViewModels/HomeWindowViewModel.cs         |  3 ++-
 DM_Weight/ViewModels/InvoiceInWindowViewModel.cs    | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index 68756f1..f92db28 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -565,7 +565,7 @@ namespace DM_Weight.ViewModels
                             Task.Factory.StartNew(() =>
                             {
                                 // 更新屏显库存
-                                List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 5);
+                                List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType == 5);
                                 if (singleChannels.Count > 0)
                                 {
                                     singleChannels.ForEach(it =>
@@ -577,7 +577,7 @@ namespace DM_Weight.ViewModels
                                 List<ChannelStock> singleChannelsBoxSmart = record.FindAll(it => it.BoardType == 35);
                                 if ((singleChannelsBoxSmart.Count > 0 ? singleChannelsBoxSmart[0].BoardType : 1) == 35)
                                 {
-                                    singleChannels.ForEach(it =>
+                                    singleChannelsBoxSmart.ForEach(it =>
                                     {
                                         _portUtil.WriteQuantityMethod((it.Quantity - it.TakeQuantity), it.DrawerNo, it.ColNo);
                                         Thread.Sleep(150);
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index a661a8d..0820fae 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -192,6 +192,7 @@ namespace DM_Weight.ViewModels
                     logger.Info($"未关闭抽屉切换菜单");
                     SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
                     SnackbarMessageQueue.Enqueue("请关闭抽屉后再切换菜单");
+                    return;
                 }
             }
         }
@@ -224,7 +225,7 @@ namespace DM_Weight.ViewModels
             else
             {
                 //SelectedMenu.Children = SelectedMenu.Children;
-                SelectedChildMenu = SelectedMenu.Children[0];
+                //SelectedChildMenu = SelectedMenu.Children[0];
                 if (!_portUtil.Operate)
                 {
                     _regionManager.RequestNavigate("ContentRegion", SelectedMenu.Children[0].PremissionPath);
diff --git a/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs b/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
index 8e2434d..fa29142 100644
--- a/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
+++ b/DM_Weight/ViewModels/InvoiceInWindowViewModel.cs
@@ -283,7 +283,17 @@ namespace DM_Weight.ViewModels
                 //}
                 if (flag)
                 {
-                    AddChannels = ChannelStocks.FindAll(it => it.AddQuantity != 0&&it.Location!="未绑定");
+                    AddChannels = ChannelStocks.FindAll(it => it.AddQuantity != 0 && it.Location != "未绑定");
+                    if (AddChannels == null|| AddChannels.Count<=0)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "药品未绑定或未输入数量",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        return;
+                    }
                     AddChannels.Sort((a, b) =>
                     {
                         if ((a.DrawerNo - b.DrawerNo) == 0)