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/resource.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h index 8f303c6..52ee640 100644 --- a/SourceCode/Bond/Servo/resource.h +++ b/SourceCode/Bond/Servo/resource.h @@ -61,12 +61,13 @@ #define IDD_CJ_PAGE3 180 #define IDD_DIALOG_USER_MANAGER2 181 #define IDD_DIALOG_USER_EDIT2 182 -#define IDD_PROD_OVERVIEW 183 +#define IDD_PROD_OVERVIEW 183 #define IDD_DIALOG_USERX_LOG 184 #define IDD_DIALOG_VARIABLE_EDIT2 186 #define IDD_DIALOG_REPORT_EDIT 187 #define IDD_DIALOG_EVENT_EDIT 188 #define IDD_PANEL_PRODUCTION 189 +#define IDD_PROD_CTRL_STATE 190 #define IDC_SERVO_GRAPH1 1001 #define IDC_BUTTON_LOG 1002 #define IDC_EDIT_LOG 1003 @@ -324,10 +325,13 @@ #define IDC_EDIT_EVT_DESC 1245 #define IDC_LIST_EVT_RPTS 1246 #define IDC_ACCORDION_WND1 1247 -#define IDC_PROD_DAY_OUTPUT 1248 -#define IDC_PROD_NIGHT_OUTPUT 1249 -#define IDC_PROD_DAY_TAKT 1250 -#define IDC_PROD_NIGHT_TAKT 1251 +#define IDC_PROD_DAY_OUTPUT 1248 +#define IDC_PROD_NIGHT_OUTPUT 1249 +#define IDC_PROD_DAY_TAKT 1250 +#define IDC_PROD_NIGHT_TAKT 1251 +#define IDC_BUTTON_OFFLINE 1252 +#define IDC_BUTTON_ONLINE_LOCAL 1253 +#define IDC_BUTTON_ONLINE_REMOTE 1254 #define ID_MENU_HELP_ABOUT 32771 #define ID_MENU_FILE_EXIT 32772 #define ID_MENU_FILE_SECSTEST 32773 @@ -367,7 +371,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 191 #define _APS_NEXT_COMMAND_VALUE 32804 -#define _APS_NEXT_CONTROL_VALUE 1252 +#define _APS_NEXT_CONTROL_VALUE 1255 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- Gitblit v1.9.3