From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。
---
SourceCode/Bond/Servo/CUserManager2.h | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CUserManager2.h b/SourceCode/Bond/Servo/CUserManager2.h
index 7430b00..794f454 100644
--- a/SourceCode/Bond/Servo/CUserManager2.h
+++ b/SourceCode/Bond/Servo/CUserManager2.h
@@ -1,4 +1,8 @@
#pragma once
+
+#include <string>
+#include <vector>
+
class CUserManager2
{
public:
@@ -6,12 +10,36 @@
CUserManager2(const CUserManager2&) = delete;
CUserManager2& operator=(const CUserManager2&) = delete;
+ struct RoleInfo
+ {
+ std::wstring name;
+ int level = 0;
+ };
+
+ struct UserInfo
+ {
+ std::wstring userName;
+ std::wstring displayName;
+ std::wstring roleName;
+ int roleLevel = 0;
+ bool enabled = false;
+ };
+
public:
void init(const char* pszDir);
bool login(const char* pszAccount, const char* pszPwd);
bool isLoggedIn();
std::string getCurrentUserName();
bool IsAdminCurrent();
+ std::vector<RoleInfo> getRoles();
+ std::vector<UserInfo> getUsers();
+ int addUser(const std::wstring& userName, const std::wstring& displayName,
+ const std::wstring& password, const std::wstring& roleName, bool enabled);
+ int updateUser(const std::wstring& userName, const std::wstring& displayName,
+ const std::wstring& password, const std::wstring& roleName, bool enabled);
+ int deleteUser(const std::wstring& userName);
+ int setUserEnabled(const std::wstring& userName, bool enabled);
+ int resetPassword(const std::wstring& userName, const std::wstring& password);
private:
CUserManager2();
--
Gitblit v1.9.3