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/Common.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h index 93ff1aa..4969d57 100644 --- a/SourceCode/Bond/Servo/Common.h +++ b/SourceCode/Bond/Servo/Common.h @@ -18,6 +18,8 @@ #define RX_CODE_EQ_DATA_CHANGED 1010 #define RX_CODE_MASTER_STATE_CHANGED 1011 #define RX_CODE_EQ_ROBOT_TASK 1012 +#define RX_CODE_LOADPORT_STATUS_CHANGED 1014 +#define RX_CODE_CONTROL_STATE_CHANGED 1015 /* Channel Name */ @@ -28,6 +30,7 @@ #define APPDLG_BACKGROUND_COLOR RGB(255, 255, 255) #define LOGDLG_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_MASTER_BACKGROUND_COLOR RGB(255, 255, 255) +#define PANEL_PRODUCTION_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_ATTRIBUTES_BACKGROUND_COLOR RGB(255, 255, 255) #define PANEL_EQUIPMENT_BACKGROUND_COLOR RGB(255, 255, 255) #define PAGE_GRPAH1_BACKGROUND_COLOR RGB(255, 255, 255) @@ -45,6 +48,8 @@ #define STATUSBAR_BK_STARTING RGB(58, 127, 78) #define STATUSBAR_BK_RUNNING RGB(34, 177, 76) #define STATUSBAR_BK_ALARM RGB(255, 127, 39) +#define CIM_STATUS_BK_SELECTED STATUSBAR_BK_RUNNING +#define CIM_STATUS_BK_DISCONNECTED STATUSBAR_BK_NORMAL /* LOG BTN */ #define BTN_LOG_FRAME_NORMAL RGB(88, 88, 88) @@ -444,6 +449,10 @@ #define STEP_ID_PROT2_CASSETTE_TYPE_CHANGE_REPLY 0x699 #define STEP_ID_PROT3_CASSETTE_TYPE_CHANGE_REPLY 0x69A #define STEP_ID_PROT4_CASSETTE_TYPE_CHANGE_REPLY 0x69B +#define STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY 0x6A0 +#define STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY 0x6A1 +#define STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY 0x6A2 +#define STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY 0x6A3 #define STEP_ID_ROBOT_CMD_REPLY 0x6b0 @@ -543,4 +552,8 @@ #define ROBOT_EVENT_FINISH 1 // 正常完成 #define ROBOT_EVENT_ERROR 2 // 出现错误 #define ROBOT_EVENT_ABORT 3 // 人为中止 -#define ROBOT_EVENT_RESTORE 4 // 回撤 \ No newline at end of file +#define ROBOT_EVENT_RESTORE 4 // 回撤 + + +/* PPID名字最大长度 */ +#define PPID_NAME_MAX 80 \ No newline at end of file -- Gitblit v1.9.3