From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
SourceCode/Bond/Servo/CUserManager2Dlg.h | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CUserManager2Dlg.h b/SourceCode/Bond/Servo/CUserManager2Dlg.h
index 5085a9e..2a2507c 100644
--- a/SourceCode/Bond/Servo/CUserManager2Dlg.h
+++ b/SourceCode/Bond/Servo/CUserManager2Dlg.h
@@ -1,26 +1,45 @@
锘�#pragma once
-
-// CUserManager2Dlg 瀵硅瘽妗�
+#include "CUserManager2.h"
+#include <string>
+#include <vector>
class CUserManager2Dlg : public CDialogEx
{
DECLARE_DYNAMIC(CUserManager2Dlg)
public:
- CUserManager2Dlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ CUserManager2Dlg(CWnd* pParent = nullptr);
virtual ~CUserManager2Dlg();
-// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_USER_MANAGER2 };
#endif
protected:
- virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+ virtual void DoDataExchange(CDataExchange* pDX);
DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnBnClickedButtonAdd();
+ afx_msg void OnBnClickedButtonEdit();
+ afx_msg void OnBnClickedButtonDel();
+ afx_msg void OnBnClickedButtonResetPwd();
+ afx_msg void OnBnClickedButtonEnable();
+ afx_msg void OnLvnItemchangedUsers(NMHDR* pNMHDR, LRESULT* pResult);
+
+private:
+ CListCtrl m_listUsers;
+ std::vector<CUserManager2::UserInfo> m_users;
+
+ void InitList();
+ void RefreshUserList();
+ void UpdateButtonState();
+ int GetSelectedIndex() const;
+ const CUserManager2::UserInfo* GetSelectedUser() const;
+ std::wstring ToWString(const CString& text) const;
+ void ShowErrorMessage(const CString& action, int code);
+ bool IsCurrentUser(const CUserManager2::UserInfo& info) const;
};
--
Gitblit v1.9.3