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/CPanel.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/CPanel.cpp b/SourceCode/Bond/BondEq/CPanel.cpp
index 188c5fa..b0afd5a 100644
--- a/SourceCode/Bond/BondEq/CPanel.cpp
+++ b/SourceCode/Bond/BondEq/CPanel.cpp
@@ -193,12 +193,12 @@
int CPanel::getBlodLen()
{
- return sizeof(UNITDATA1) * (4 + m_datas.size()) + PARAM_RAWDATA_SIZE;
+ return sizeof(UNITDATA1) * (4 + (int)m_datas.size()) + PARAM_RAWDATA_SIZE;
}
int CPanel::getBlod(char* pszBuffer, int nBufferSize)
{
- int size = sizeof(UNITDATA1) * (4 + m_datas.size()) + PARAM_RAWDATA_SIZE;
+ int size = sizeof(UNITDATA1) * (4 + (int)m_datas.size()) + PARAM_RAWDATA_SIZE;
if (nBufferSize < size)
return -1;
memcpy(pszBuffer, m_pszParamsRawData, PARAM_RAWDATA_SIZE);
@@ -634,7 +634,7 @@
addIntParam("A单元_下腔体冷却温度", "", v);
i += 2;
- addIntParam("A单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
+ addDoubleParam("A单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
i += 4;
v = (m_pszParamsRawData[i] & 0xff) | (m_pszParamsRawData[i + 1] & 0xff) << 8;
@@ -858,7 +858,7 @@
addIntParam("B单元_下腔体冷却温度", "", v);
i += 2;
- addIntParam("B单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
+ addDoubleParam("B单元_压感压纸气囊压力设定值", "", (double)toFloat(&pszData[i]));
i += 4;
v = (m_pszParamsRawData[i] & 0xff) | (m_pszParamsRawData[i + 1] & 0xff) << 8;
--
Gitblit v1.9.3