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/BondEq/stdafx.h | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/BondEq/stdafx.h b/SourceCode/Bond/BondEq/stdafx.h index 285fe37..cef3da3 100644 --- a/SourceCode/Bond/BondEq/stdafx.h +++ b/SourceCode/Bond/BondEq/stdafx.h @@ -47,8 +47,30 @@ #include "..\DatabaseSDK\include\MySQLDatabase.h" #include "..\DatabaseSDK\include\SQLiteDatabase.h" -// 控件模块 -#include "..\BLControlsSDK\include\BLControls.h" +// 单例模式的数据库管理类 +#include "UserManager.h" +#include "RecipeManager.h" +#include "SystemLogManager.h" +#include "AlarmManager.h" + +// 控件样式 +static UINT g_nGridFixCellColor = RGB(144, 200, 246); +static UINT g_nGridFixFontColor = RGB(0, 0, 0); +static UINT g_nGridCellColor = RGB(255, 255, 224); +static UINT g_nGridCellColor_NonSelect = RGB(150, 150, 150); +static UINT g_nGridCellReadyColor = RGB(255, 255, 0); +static UINT g_nGridCellOnColor = RGB(255, 69, 0); +static UINT g_nGridCellOffColor = RGB(128, 191, 255); +static UINT g_nPropertyGridFixCellColor = RGB(150, 150, 150); +static UINT g_nPropertyGridFixFontColor = RGB(0, 0, 0); +static UINT g_nSequenceOffColor = RGB(0, 0, 0); +static UINT g_nSequenceOnColor = RGB(0, 180, 0); +static UINT g_nSequenceErrorColor = RGB(255, 0, 0); +static UINT g_nSequenceWarningColor = RGB(255, 255, 0); +static UINT g_nSequenceReadyColor = RGB(0, 0, 255); +static UINT g_nSequenceRunningColor = RGB(0, 255, 255); +static UINT g_nSequencePauseColor = RGB(255, 0, 255); +static UINT g_nSequenceStopColor = RGB(128, 128, 128); #if defined(_WIN64) #if defined(_DEBUG) -- Gitblit v1.9.3