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/BondEq/CProjectPageMain.cpp | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CProjectPageMain.cpp b/SourceCode/Bond/BondEq/CProjectPageMain.cpp
index 366c665..53f1689 100644
--- a/SourceCode/Bond/BondEq/CProjectPageMain.cpp
+++ b/SourceCode/Bond/BondEq/CProjectPageMain.cpp
@@ -22,7 +22,6 @@
m_crBkgnd = PROPAGE_BACKGROUND_COLOR;
m_hbrBkgnd = nullptr;
m_pObserver = nullptr;
-
for (int i = 0; i < BTN_MAX; i++) {
m_pBlBtns[i] = new CBlButton();
}
@@ -125,7 +124,6 @@
ON_MESSAGE(ID_MSG_UPDATA_DATA_TO_UI, &CProjectPageMain::OnUpdateDataToUI)
END_MESSAGE_MAP()
-
// CProjectPageMain 娑堟伅澶勭悊绋嬪簭
void CProjectPageMain::InitRxWindows()
@@ -214,7 +212,6 @@
SetButtonBackgroundColors(m_pBlBtns[BTN_STOP], capactity == 0);
}
}
-
pAny->release();
}, [&]() -> void {
// onComplete
@@ -369,16 +366,5 @@
LRESULT CProjectPageMain::OnUpdateDataToUI(WPARAM wParam, LPARAM lParam)
{
- /*
- CString strText;
- strText.Format(_T("%d %s"), nVelocityRatio, _T("%"));
- GetDlgItem(IDC_EDIT_VELOCITY_RATIO)->SetWindowText(strText);
-
- strText.Format(_T("%.2f"), dTactTime);
- GetDlgItem(IDC_EDIT_TACT_TIME)->SetWindowText(strText);
-
- SetDlgItemInt(IDC_EDIT_DAY_SHIFT_CAPACITY, nDayShiftCapacity);
- SetDlgItemInt(IDC_EDIT_NIGHT_SHIFT_CAPACITY, nNightShiftCapacity);
- */
return 0;
}
--
Gitblit v1.9.3