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/CMyStatusbar.h | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CMyStatusbar.h b/SourceCode/Bond/Servo/CMyStatusbar.h index 283ca03..b1fdfa8 100644 --- a/SourceCode/Bond/Servo/CMyStatusbar.h +++ b/SourceCode/Bond/Servo/CMyStatusbar.h @@ -1,5 +1,9 @@ 锘�#pragma once +#include "BlButton.h" +#include "ColorTransfer.h" + +#define ID_MSG_STATUSBAR_BTN_CLICKED WM_USER + 20398 // CMyStatusbar 瀵硅瘽妗� @@ -13,16 +17,23 @@ public: - void setBkgnd(COLORREF color); + void setBackgroundColor(COLORREF color); + void setForegroundColor(COLORREF cr); void setRunTimeText(const char* pszText); + void setCurTaskBtnText(const char* pszText); + void setCimBtnText(const char* pszText); + void setCurTaskBtnColors(COLORREF face, COLORREF frame, COLORREF text); + void setCimBtnColors(COLORREF face, COLORREF frame, COLORREF text); private: void Resize(); private: + COLORREF m_crForeground; COLORREF m_crBkgnd; CBrush m_brBkgnd; - + CBlButton m_btnCurTask; + CBlButton m_btnCim; // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME @@ -38,4 +49,5 @@ afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); afx_msg void OnDestroy(); afx_msg void OnSize(UINT nType, int cx, int cy); + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam); }; -- Gitblit v1.9.3