交接柜添加修改用户时将用户同步到毒麻柜
This commit is contained in:
		
							parent
							
								
									8252fba641
								
							
						
					
					
						commit
						cd77fd6f1b
					
				| 
						 | 
					@ -12,7 +12,9 @@
 | 
				
			||||||
	<appSettings>
 | 
						<appSettings>
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		<!-- 设备id -->
 | 
							<!-- 设备id -->
 | 
				
			||||||
		<add key="machineId" value="DM3" />
 | 
							<add key="machineId" value="DM5" />
 | 
				
			||||||
 | 
							<!-- 毒麻设备id -->
 | 
				
			||||||
 | 
							<add key="dm_machineId" value="DM3" />
 | 
				
			||||||
		<!--请领药库-->
 | 
							<!--请领药库-->
 | 
				
			||||||
		<add key="colloctedId" value="住院,DM2,门诊,DM22" />
 | 
							<add key="colloctedId" value="住院,DM2,门诊,DM22" />
 | 
				
			||||||
		<!-- 供应单位 -->
 | 
							<!-- 供应单位 -->
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,6 +36,9 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            set => SetProperty(ref _userList, value);
 | 
					            set => SetProperty(ref _userList, value);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public UserList DMUserList;
 | 
				
			||||||
 | 
					        private string UserName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public List<RoleDm> Roles { get; set; }
 | 
					        public List<RoleDm> Roles { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        private string _oldPass;
 | 
					        private string _oldPass;
 | 
				
			||||||
| 
						 | 
					@ -107,11 +110,16 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    // 修改密码
 | 
					                    // 修改密码
 | 
				
			||||||
                    if (OnlyPassword)
 | 
					                    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()))
 | 
					                        if (MD5.GetMD5Hash(OldPass).ToLower().Equals(UserList.PassWord.ToLower()))
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            // 旧密码输入正确
 | 
					                            // 旧密码输入正确
 | 
				
			||||||
                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
					                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
				
			||||||
                            SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.PassWord }).ExecuteCommand();
 | 
					                            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));
 | 
					                            RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
| 
						 | 
					@ -125,25 +133,49 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        if (UserList.Id > 0)
 | 
					                        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))
 | 
					                            if (string.IsNullOrEmpty(NewPass))
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.UserBarcode, u.RoleId }).ExecuteCommand();
 | 
					                                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
 | 
					                            else
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
					                                UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
				
			||||||
                                SqlSugarHelper.Db.Updateable<UserList>(UserList).UpdateColumns(u => new { u.Nickname, u.UserName, u.PassWord, u.UserBarcode, u.RoleId }).ExecuteCommand();
 | 
					                                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
 | 
					                        else
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            UserList.PassWord = MD5.GetMD5Hash(NewPass);
 | 
					                            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();
 | 
					                            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));
 | 
					                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
| 
						 | 
					@ -198,12 +230,14 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                OnlyPassword = parameters.GetValue<bool>("EditPass");
 | 
					                OnlyPassword = parameters.GetValue<bool>("EditPass");
 | 
				
			||||||
                EditUser = false;
 | 
					                EditUser = false;
 | 
				
			||||||
                Title = "修改密码";
 | 
					                Title = "修改密码";
 | 
				
			||||||
 | 
					                UserName = UserList.UserName;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                if (parameters.ContainsKey("User"))
 | 
					                if (parameters.ContainsKey("User"))
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    UserList = parameters.GetValue<UserList>("User");
 | 
					                    UserList = parameters.GetValue<UserList>("User");
 | 
				
			||||||
 | 
					                    UserName = UserList.UserName;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (UserList.Id == null)
 | 
					                if (UserList.Id == null)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue