From 9f3f798670e87b91c1b4c4d2b1c44bb850a34153 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 17:47:43 +0800
Subject: [PATCH] 车间退料入库质检状态默认合格
---
Wms/WMS.BLL/SysServer/UserInforServer.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 417dc61..56e7168 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -26,6 +26,7 @@
private readonly IFunSettingServer _setting;
private static readonly SqlSugarScope Db = DataContext.Db;
private readonly UserManager _userManager;
+
public UserInforServer(IMapper mapper, IFunSettingServer setting, UserManager userManager)
{
_mapper = mapper;
@@ -33,8 +34,11 @@
_userManager = userManager;
}
- public async Task<int> LoginAdmin(string loginName, string loginPwd)
+
+ public async Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd)
{
+ UserInfoDto userDto = new UserInfoDto();
+
//鏌ヨ瀵嗙爜宸查敊璇鏁�
string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'";
int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql);
@@ -57,11 +61,16 @@
//鏈�鍚庣櫥闄嗘椂闂�
await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
- return modUser.Id;
+
+ userDto.Id = modUser.Id;
+ userDto.RealName = modUser.RealName;
+ return userDto;
}
else //褰撳墠璐﹀彿琚鐢�
{
- return 0;
+ userDto.Id = 0;
+ userDto.RealName = "";
+ return userDto;
}
}
else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
@@ -70,12 +79,20 @@
string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'";
int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql);
- return -1;
+ userDto.Id = -1;
+ userDto.RealName = "";
+ return userDto;
}
}
else//閿佸畾璐﹀彿
{
- return -2;
+ //璐﹀彿鏀逛负鍋滅敤
+ string uptUserStatusSql = $@"update SysUserInfor set Status=1 where UserName='{loginName}'";
+ int uptUserStatus = Db.Ado.ExecuteCommand(uptUserStatusSql);
+
+ userDto.Id = -2;
+ userDto.RealName = "";
+ return userDto;
}
}
@@ -181,7 +198,7 @@
public async Task<int> UpdateUserinfo(UserInfoDto userdto)
{
//鏄犲皠鏁版嵁妯″瀷
- SysUserInfor userlist = _mapper.Map<SysUserInfor>(userdto);
+ SysUserInfor userInfo = _mapper.Map<SysUserInfor>(userdto);
//鍒ゆ柇鐢ㄦ埛鍙锋槸鍚﹀敮涓�
int count = await GetUserInfoByNo(userdto.UserNo, userdto.UserName, userdto.Id);
int i = 0;
@@ -193,9 +210,22 @@
{
userdto.UpdateUser = _userManager.UserId;
userdto.UpdateTime = DateTime.Now;
- i = await Db.Updateable(userlist)
- .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.UpdateUser, s.UpdateTime })
+
+ //鐘舵�佹仮澶嶆甯革紝娓呴櫎瀵嗙爜閿欒娆℃暟
+ if (userdto.Status == "0")
+ {
+ userInfo.PwdErrNum = 0;
+ i = await Db.Updateable(userInfo)
+ .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.PwdErrNum, s.UpdateUser, s.UpdateTime })
.ExecuteCommandAsync();
+ }
+ else
+ {
+ i = await Db.Updateable(userInfo)
+ .UpdateColumns(s => new { s.UserName, s.UserNo, s.Sex, s.RoleNo, s.RealName, s.Phone, s.Paper, s.Nationality, s.JobNo, s.Email, s.Demo, s.Addres, s.Status, s.UpdateUser, s.UpdateTime })
+ .ExecuteCommandAsync();
+ }
+
if (i <= 0)
throw Oops.Bah("缂栬緫鐢ㄦ埛淇℃伅澶辫触");
}
--
Gitblit v1.8.0