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/BoounionPLC/stdafx.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BoounionPLC/stdafx.h b/SourceCode/Bond/BoounionPLC/stdafx.h index d43089c..400123b 100644 --- a/SourceCode/Bond/BoounionPLC/stdafx.h +++ b/SourceCode/Bond/BoounionPLC/stdafx.h @@ -34,12 +34,52 @@ #include <afxcontrolbars.h> // 功能区和控件条的 MFC 支持 +// 控件样式 +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); #include "..\RxWindows1.0\include\RxWindowsLib.h" #include "..\McLibrarySDK\include\McLib.h" +// 数据库模块 +#include "..\DatabaseSDK\include\Database.h" +#include "..\DatabaseSDK\include\MySQLDatabase.h" +#include "..\DatabaseSDK\include\SQLiteDatabase.h" + +#if defined(_WIN64) +#if defined(_DEBUG) +#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Debug\\DatabaseEx.lib") +#pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Debug\\BLControlsD.lib") +#else +#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Release\\DatabaseEx.lib") +#pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Release\\BLControls.lib") +#endif +#else +#if defined(_DEBUG) +#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Debug\\DatabaseEx.lib") +#pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Debug\\BLControlsD.lib") +#else +#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Release\\DatabaseEx.lib") +#pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Release\\BLControls.lib") +#endif +#endif #ifdef _UNICODE -- Gitblit v1.9.3