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/TopToolbar.cpp | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/BoounionPLC/TopToolbar.cpp b/SourceCode/Bond/BoounionPLC/TopToolbar.cpp index 0fbbb05..72b0cc3 100644 --- a/SourceCode/Bond/BoounionPLC/TopToolbar.cpp +++ b/SourceCode/Bond/BoounionPLC/TopToolbar.cpp @@ -29,6 +29,7 @@ DDX_Control(pDX, IDC_BUTTON_ADD, m_btnAdd); DDX_Control(pDX, IDC_BUTTON_DELETE, m_btnDelete); DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings); + DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm); DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator); } @@ -51,6 +52,7 @@ InitBtn(m_btnAdd, "Add_blue_32.ico", "Add_Gray_32.ico"); InitBtn(m_btnDelete, "delete_blue_32.ico", "delete_Gray_32.ico"); InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico"); + InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_Gray_32.ico"); InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico"); HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR)); m_btnOperator.SetMenu(hMenu); @@ -123,6 +125,11 @@ x += BTN_WIDTH; x += 2; + pItem = GetDlgItem(IDC_BUTTON_ALARM); + pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight); + x += BTN_WIDTH; + x += 2; + x = rcClient.right - 5 - BTN_WIDTH - 20; pItem = GetDlgItem(IDC_BUTTON_OPERATOR); pItem->MoveWindow(x, y, BTN_WIDTH + 20, nBthHeight); @@ -170,6 +177,7 @@ case IDC_BUTTON_ADD: case IDC_BUTTON_DELETE: case IDC_BUTTON_SETTINGS: + case IDC_BUTTON_ALARM: GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam)); break; } -- Gitblit v1.9.3