From a1bf060d50da3c27b54bcc349e8b53769b39ef89 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 六月 2025 17:31:33 +0800
Subject: [PATCH] 1.增加Aligner --> Bonder1 | Bonder2的搬送检测逻辑； 2.优化搬送逻辑。搬送要分优先考虑的主类型和次要类型。一种情况，如果不分主次，一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1, Bonder1和Bonder2需要的G2就过不来了（在Aligner阻塞了）。另外从生产效率上来说，也应该根据需求，尽快使其中一台Bonder的两片玻璃匹配以使其能尽快开始生产加工。
---
SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
index e031a81..3ac5196 100644
--- a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
@@ -5,7 +5,6 @@
#include "BondEq.h"
#include "afxdialogex.h"
#include "ChangePasswordDlg.h"
-#include "UserManager.h"
// CChangePasswordDlg 瀵硅瘽妗�
@@ -82,6 +81,12 @@
return;
}
+ SystemLogManager& logManager = SystemLogManager::getInstance();
+ if (newPassword.Compare(currentPassword) == 0) {
+ EndDialog(IDCANCEL);
+ return;
+ }
+
#ifdef UNICODE
std::string strUsername = CStringA(username);
std::string strCurrentPassword = CStringA(currentPassword);
@@ -96,12 +101,14 @@
if (userManager.isLoggedIn() && strCurrentPassword.compare(userManager.getCurrentPass()) == 0) {
if (changeUserPassword(userManager, strUsername, strNewPassword)) {
EndDialog(IDOK);
+ logManager.log(SystemLogManager::LogType::Info, "淇敼瀵嗙爜鎴愬姛锛�", strUsername);
}
}
else {
if (userManager.login(strUsername, strCurrentPassword)) {
if (changeUserPassword(userManager, strUsername, strNewPassword)) {
EndDialog(IDOK);
+ logManager.log(SystemLogManager::LogType::Info, "淇敼瀵嗙爜鎴愬姛锛�", strUsername);
}
else {
userManager.logout();
--
Gitblit v1.9.3