From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
index 2c740c4..1928834 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs
@@ -183,5 +183,27 @@
}
return content;
}
+
+ public WebResponseContent ModifyUserPwd(string password, string userName)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(userName))
+ {
+ return webResponse.Error("鍙傛暟涓嶅畬鏁�");
+ }
+ if (password.Length < 6) return webResponse.Error("瀵嗙爜闀垮害涓嶈兘灏戜簬6浣�");
+
+
+ Sys_User user = BaseDal.QueryFirst(x => x.UserName == userName);
+ if (user == null)
+ {
+ return webResponse.Error("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+ user.UserPwd = password.EncryptDES(AppSecret.User);
+ BaseDal.UpdateData(user);
+ //濡傛灉鐢ㄦ埛鍦ㄧ嚎锛屽己鍒朵笅绾�
+ //UserContext.Current.LogOut(user.User_Id);
+ return webResponse.OK("瀵嗙爜淇敼鎴愬姛");
+ }
}
}
--
Gitblit v1.9.3