From cd77fd6f1bae3aa766ddce8fc0b630cd54f2ae65 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 7 Aug 2024 11:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=97=B6=E5=B0=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8C=E6=AD=A5=E5=88=B0=E6=AF=92=E9=BA=BB=E6=9F=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  4 ++-
 .../ViewModels/EditUserDialogViewModel.cs     | 36 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 8bfec14..3b4ccbb 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -12,7 +12,9 @@
 	<appSettings>
 		
 		<!-- 设备id -->
-		<add key="machineId" value="DM3" />
+		<add key="machineId" value="DM5" />
+		<!-- 毒麻设备id -->
+		<add key="dm_machineId" value="DM3" />
 		<!--请领药库-->
 		<add key="colloctedId" value="住院,DM2,门诊,DM22" />
 		<!-- 供应单位 -->
diff --git a/DM_Weight/ViewModels/EditUserDialogViewModel.cs b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
index 6d2498a..d1d12b4 100644
--- a/DM_Weight/ViewModels/EditUserDialogViewModel.cs
+++ b/DM_Weight/ViewModels/EditUserDialogViewModel.cs
@@ -36,6 +36,9 @@ namespace DM_Weight.ViewModels
             set => SetProperty(ref _userList, value);
         }
 
+        public UserList DMUserList;
+        private string UserName;
+
         public List<RoleDm> Roles { get; set; }
 
         private string _oldPass;
@@ -107,11 +110,16 @@ namespace DM_Weight.ViewModels
                     // 修改密码
                     if (OnlyPassword)
                     {
+                        DMUserList = SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["dm_machineId"]??"DM3") && r.UserName == UserName).OrderBy(r => r.Id).First();
+
                         if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
                         {
                             // 旧密码输入正确
                             UserList.PassWord = MD5.GetMD5Hash(NewPass);
                             SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
+                            //修改交接柜用户密码
+                            DMUserList.PassWord = UserList.PassWord;
+                            SqlSugarHelper.Db.Updateable<UserList>(DMUserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
                             // 关闭当前窗口
                             RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
                         }
@@ -125,25 +133,49 @@ namespace DM_Weight.ViewModels
                     {
                         if (UserList.Id > 0)
                         {
+                            DMUserList = SqlSugarHelper.Db.Queryable<UserList>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["dm_machineId"]??"DM3") && r.UserName == UserName).OrderBy(r => r.Id).First();
+
                             // 更新
                             // 没有写密码
                             if (string.IsNullOrEmpty(NewPass))
                             {
                                 SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
+                                //更新交接柜用户
+                                DMUserList.Nickname = UserList.Nickname;
+                                DMUserList.UserName = UserList.UserName;
+                                DMUserList.UserBarcode = UserList.UserBarcode;
+                                SqlSugarHelper.Db.Updateable<UserList>(DMUserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
                             }
                             // 更改了密码
                             else
                             {
                                 UserList.PassWord = MD5.GetMD5Hash(NewPass);
                                 SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
+
+                                DMUserList.PassWord = UserList.PassWord;
+                                DMUserList.Nickname= UserList.Nickname;
+                                DMUserList.UserName= UserList.UserName;
+                                DMUserList.UserBarcode= UserList.UserBarcode;
+                                SqlSugarHelper.Db.Updateable<UserList>(DMUserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
+
                             }
                         }
                         else
                         {
                             UserList.PassWord = MD5.GetMD5Hash(NewPass);
-                            UserList.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM3";
+                            UserList.MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM5";
                             // 插入
                             SqlSugarHelper.Db.Insertable<UserList>(UserList).InsertColumns(u => new { u.Id, u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId, u.MachineId }).ExecuteCommand();
+
+                            // 插入交接柜用户
+                            int? roleId = SqlSugarHelper.Db.Queryable<RoleDm>().Where(r => r.MachineId == (ConfigurationManager.AppSettings["dm_machineId"]??"DM3")).OrderBy(r => r.Id).Select(r => r.Id).First();
+                            DMUserList = UserList;
+                            DMUserList.MachineId =  ConfigurationManager.AppSettings["dm_machineId"] ?? "DM3";
+                            DMUserList.RoleId = roleId;
+                            SqlSugarHelper.Db.Insertable<UserList>(DMUserList).InsertColumns(u => new { u.Id, u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId, u.MachineId }).ExecuteCommand();
+
                         }
                         RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
                     }
@@ -198,12 +230,14 @@ namespace DM_Weight.ViewModels
                 OnlyPassword = parameters.GetValue<bool>("EditPass");
                 EditUser = false;
                 Title = "修改密码";
+                UserName = UserList.UserName;
             }
             else
             {
                 if (parameters.ContainsKey("User"))
                 {
                     UserList = parameters.GetValue<UserList>("User");
+                    UserName = UserList.UserName;
                 }
                 if (UserList.Id == null)
                 {