From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug

---
 Wms/WMS.BLL/SysServer/UserInforServer.cs |   50 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 48d461d..417dc61 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -35,25 +35,49 @@
 
         public async Task<int> LoginAdmin(string loginName, string loginPwd)
         {
-            //loginPwd = Md5Tools.CalcMd5(loginPwd);
-            var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd &&m.IsDel=="0");
-            if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝g‘
+            //鏌ヨ瀵嗙爜宸查敊璇鏁�
+            string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'";
+            int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql);
+            //璁惧畾瀵嗙爜閿欒鐨勬鏁�
+            string funNumSql = $@"select SetValue from SysFunSetting where IsDel='0' and IsEnable='NO' and FunSetNo='pwdErrNum' and GroupNo='pwdErrNum'";
+            int funNum = Db.Ado.GetInt(funNumSql);
+
+            //姣旇緝璁惧畾娆℃暟鍜屽凡閿欒娆℃暟
+            if (pwdErrNum < funNum)
             {
-                if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝e父鍚敤
+                //loginPwd = Md5Tools.CalcMd5(loginPwd);
+                var modUser = await Db.Queryable<SysUserInfor>().FirstAsync(m => m.UserName == loginName && m.PassWord == loginPwd && m.IsDel == "0");
+                if (modUser != null) //璐﹀彿瀵嗙爜鏄惁姝g‘
                 {
-                    //鏈�鍚庣櫥闄嗘椂闂�
-                    await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
-                    return modUser.Id;
+                    if (modUser.Status == "0") //褰撳墠璐﹀彿鏄惁姝e父鍚敤
+                    {
+                        //瀵嗙爜閿欒娆℃暟+1
+                        string uptErrNumSql = $@"update SysUserInfor set PwdErrNum=0 where UserName='{loginName}'";
+                        int uptErrNum = Db.Ado.ExecuteCommand(uptErrNumSql);
+
+                        //鏈�鍚庣櫥闄嗘椂闂�
+                        await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
+                        return modUser.Id;
+                    }
+                    else //褰撳墠璐﹀彿琚鐢�
+                    {
+                        return 0;
+                    }
                 }
-                else //褰撳墠璐﹀彿琚鐢�
+                else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
                 {
-                    return 0;
+                    //瀵嗙爜閿欒娆℃暟+1
+                    string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'";
+                    int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql);
+
+                    return -1;
                 }
             }
-            else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
+            else//閿佸畾璐﹀彿
             {
-                return -1;
+                return -2;
             }
+
         }
 
         /// <summary>
@@ -67,7 +91,7 @@
                                         .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
                                         .LeftJoin<SysDepartment>((a, b, c) => a.DepartmentNo == c.DepartmentNo)
                                         .LeftJoin<SysRoles>((a, b, c, d) => a.RoleNo == d.RoleNo)
-                                        .Where((a,b,c,d)=>d.IsDel == "0")
+                                        .Where((a, b, c, d) => d.IsDel == "0")
                                         .WhereIF(!string.IsNullOrEmpty(UserName), a => a.UserName.Contains(UserName))
                                         .WhereIF(!string.IsNullOrEmpty(DepartmentNo), a => a.DepartmentNo == DepartmentNo)
                                         .WhereIF(!string.IsNullOrEmpty(RoleNo), a => a.RoleNo == RoleNo)
@@ -195,7 +219,7 @@
         /// <param name="userId">鐢ㄦ埛id</param>
         /// <returns></returns>
         /// <exception cref="Exception">鎹曡幏寮傚父</exception>
-        public async Task<int> UptUserPassWord(string pwdNew,string pwdNewTwo, int userId)
+        public async Task<int> UptUserPassWord(string pwdNew, string pwdNewTwo, int userId)
         {
             var funSet = Db.Queryable<SysFunSetting>().Where(m => m.IsDel == "0" && m.FunSetName == "瀵嗙爜瑙勫垯" && m.IsEnable == "NO").ToList().FirstOrDefault();
             if (funSet != null)

--
Gitblit v1.8.0