From cf98e60aa8275de9f7ea64399d4c757afb8079aa Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 4 Nov 2024 08:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E8=8D=AF=E7=AE=B1=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=BD=92=E5=B1=9E=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD=20=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E8=8D=AF=E7=AE=B1=E9=A1=B5=E9=9D=A2=E4=BF=9D=E5=AD=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/OpenBoxNewWindowViewModel.cs   |  2 +-
 .../ViewModels/SettingBoxWindowViewModel.cs   | 27 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
index 13fda60..5151e31 100644
--- a/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/OpenBoxNewWindowViewModel.cs
@@ -436,7 +436,7 @@ namespace DM_Weight.ViewModels
                     {
                         SetBtnEnable(chl.DrawerNo);
                     }
-                    if (chl.BelongUser == HomeWindowViewModel.Operator.UserBarcode)
+                    if (!string.IsNullOrEmpty(chl.BelongUser)&& chl.BelongUser == HomeWindowViewModel.Operator.UserBarcode)
                     {
                         SetBtnEnable(chl.DrawerNo);
                     }
diff --git a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
index 10adb8c..69d50ef 100644
--- a/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
+++ b/DM_Weight/ViewModels/SettingBoxWindowViewModel.cs
@@ -224,18 +224,41 @@ namespace DM_Weight.ViewModels
                     ChannelList channelList = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.DrawerNo == DrawerNo && cs.MachineId == "DM5").First();
                     if (BoxTypeSelectedItem != null)
                     {
+                        int iUpdate = 0;
                         if (BoxTypeSelectedItem.TypeValue == 0 && UserListSelectedItem != null)
                         {
                             //药箱 归属药师
 
-                            SqlSugarHelper.Db.Updateable(new ChannelList() { BelongUser = UserListSelectedItem.UserId.ToString(), DrawerType = BoxTypeSelectedItem.TypeValue, Id = channelList.Id }).UpdateColumns(cl => new { cl.BelongUser, cl.DrawerType }).ExecuteCommand();
+                            iUpdate=SqlSugarHelper.Db.Updateable(new ChannelList() { BelongUser = UserListSelectedItem.UserId.ToString(), DrawerType = BoxTypeSelectedItem.TypeValue, Id = channelList.Id }).UpdateColumns(cl => new { cl.BelongUser, cl.DrawerType }).ExecuteCommand();
                         }
                         else
                         {
                             //药箱属于公共药箱
-                            SqlSugarHelper.Db.Updateable(new ChannelList() { DrawerType = BoxTypeSelectedItem.TypeValue, Id = channelList.Id }).UpdateColumns(cl => new { cl.DrawerType }).ExecuteCommand();
+                            iUpdate=SqlSugarHelper.Db.Updateable(new ChannelList() { DrawerType = BoxTypeSelectedItem.TypeValue, Id = channelList.Id }).UpdateColumns(cl => new { cl.DrawerType }).ExecuteCommand();
 
                         }
+                        if(iUpdate>0)
+                        {
+                            //提示请选择药箱
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = $"保存完成",
+                                Type = MsgType.INFO
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+
+                        }
+                        else
+                        {
+
+                            //提示请选择药箱
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = $"保存失败",
+                                Type = MsgType.ERROR
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
                     }
                 }
                 else