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/BondEq/Common.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BondEq/Common.h b/SourceCode/Bond/BondEq/Common.h index 5a559d2..edd4118 100644 --- a/SourceCode/Bond/BondEq/Common.h +++ b/SourceCode/Bond/BondEq/Common.h @@ -37,6 +37,21 @@ #define RX_CODE_EFEM_STATUS_CHANGED 1015 #define RX_CODE_EQ_STATE_CHANGED 1016 #define RX_CODE_SELECT_COMPONENT 1017 +#define RX_CODE_BONDER_BEEP 1018 +#define RX_CODE_BONDER_VELOCITY_RATIO 1019 +#define RX_CODE_BONDER_TACT_TIME 1020 +#define RX_CODE_BONDER_DAY_SHIFT_CAPACTITY 1021 +#define RX_CODE_BONDER_NIGHT_SHIFT_CAPACTITY 1022 + +// 临时添加 m_bBlBtnsStates[7] +#define RX_CODE_BONDER_STATES_BTN0 1023 +#define RX_CODE_BONDER_STATES_BTN1 1024 +#define RX_CODE_BONDER_STATES_BTN2 1025 +#define RX_CODE_BONDER_STATES_BTN3 1026 +#define RX_CODE_BONDER_STATES_BTN4 1027 +#define RX_CODE_BONDER_STATES_BTN5 1028 +#define RX_CODE_BONDER_STATES_BTN6 1029 + /* 广播代码 */ #define BC_CODE_DATA1_MATERIAL_RECEIVED 5000 @@ -161,6 +176,9 @@ #define BTN_SOUND_OFF_BKGND_NORMAL RGB(255, 127, 39) #define BTN_SOUND_OFF_BKGND_HOVER RGB(255, 157, 59) #define BTN_SOUND_OFF_BKGND_PRESS RGB(255, 100, 29) +#define BTN_SOUND_ON_BKGND_NORMAL RGB(100, 200, 100) +#define BTN_SOUND_ON_BKGND_HOVER RGB(150, 250, 150) +#define BTN_SOUND_ON_BKGND_PRESS RGB(50, 150, 50) /* 按钮id */ -- Gitblit v1.9.3