From 9176aaed52f030ccb9e00be157f893633153d1ca Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 30 八月 2024 08:55:53 +0800
Subject: [PATCH] PDA平库出库页根据出库单加载托盘所在位置
---
Wms/WMS.BLL/SysServer/UserInforServer.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 4597c85..30997b1 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -65,6 +65,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")
.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)
@@ -187,9 +188,7 @@
/// <summary>
/// 淇敼鐢ㄦ埛瀵嗙爜
/// </summary>
- /// <param name="pwdOld">鍘熷瘑鐮�</param>
/// <param name="pwdNew">鏂板瘑鐮�</param>
- /// <param name="pwdNewTwo">纭瀵嗙爜</param>
/// <param name="userId">鐢ㄦ埛id</param>
/// <returns></returns>
/// <exception cref="Exception">鎹曡幏寮傚父</exception>
@@ -199,6 +198,7 @@
.Where(s => s.Id == userId)
.SetColumns(s => s.UpdateTime == DateTime.Now)
.SetColumns(s => s.UpdateUser == _userManager.UserId)
+ .SetColumns(s=>s.PassWord == pwdNew)
.SetColumns(s => s.SetPasswordTime == DateTime.Now)
.ExecuteCommandAsync();
}
--
Gitblit v1.8.0