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/Servo/CVariable.cpp | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CVariable.cpp b/SourceCode/Bond/Servo/CVariable.cpp
index 21ddb44..e7b916c 100644
--- a/SourceCode/Bond/Servo/CVariable.cpp
+++ b/SourceCode/Bond/Servo/CVariable.cpp
@@ -7,6 +7,7 @@
{
m_nVarialbeId = 0;
m_format = SVFromat::U1;
+ m_nValue = 0;
}
CVariable::CVariable(const char* pszId, const char* pszName, const char* pszFormat, const char* pszRemark)
@@ -42,6 +43,9 @@
if (_strcmpi("A20", pszFormat) == 0) {
return SVFromat::A20;
}
+ if (_strcmpi("L", pszFormat) == 0) {
+ return SVFromat::L;
+ }
return SVFromat::U1;
}
@@ -63,6 +67,9 @@
}
if (SVFromat::A20 == format) {
return "A20";
+ }
+ if (SVFromat::L == format) {
+ return "L";
}
return "U1";
@@ -87,4 +94,60 @@
{
return m_strRemark;
}
+
+ void CVariable::setValue(__int64 value)
+ {
+ if (m_format == SVFromat::U1 || m_format == SVFromat::U2 || m_format == SVFromat::I2) {
+ m_nValue = value;
+ }
+ }
+
+ void CVariable::setValue(const char* pszValue)
+ {
+ std::string strTemp = pszValue;
+ if (m_format == SVFromat::A20) {
+ if (strTemp.length() > 20) {
+ strTemp = strTemp.substr(0, 20);
+ }
+ }
+ else if (m_format == SVFromat::A50) {
+ if (strTemp.length() > 50) {
+ strTemp = strTemp.substr(0, 50);
+ }
+ }
+
+ m_strValue = strTemp;
+ }
+
+ void CVariable::setValue(std::vector<CVariable>& vars)
+ {
+ m_varsValue = vars;
+ }
+
+ std::string CVariable::getValue()
+ {
+ std::string strRet;
+ if (m_format == SVFromat::U1 || m_format == SVFromat::U2 || m_format == SVFromat::I2) {
+ strRet = std::to_string(m_nValue);
+ }
+ else if(m_format == SVFromat::A20 || m_format == SVFromat::A50) {
+ strRet = m_strValue;
+ }
+
+ return strRet;
+ }
+
+ __int64 CVariable::getIntValue()
+ {
+ if (m_format == SVFromat::U1 || m_format == SVFromat::U2 || m_format == SVFromat::I2) {
+ return m_nValue;
+ }
+
+ return 0;
+ }
+
+ std::vector<CVariable>& CVariable::getVarsValue()
+ {
+ return m_varsValue;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3