From af5c7a6ce19dd295701348f5f7eb6ce53c91826a Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 10:58:44 +0800
Subject: [PATCH] 1.工创建PJ, 然后生产，当时有3片料，PJ只选了两片。其中两片配对生产了，按道理就不应该去取第三片了，但实际上它还去取了。修复此Bug
---
SourceCode/Bond/Servo/CJobDataS.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.cpp b/SourceCode/Bond/Servo/CJobDataS.cpp
index db1bf0d..2231b0b 100644
--- a/SourceCode/Bond/Servo/CJobDataS.cpp
+++ b/SourceCode/Bond/Servo/CJobDataS.cpp
@@ -143,7 +143,7 @@
m_pOwner = pOwner;
}
- int CJobDataS::getCassetteSequenceNo()
+ int CJobDataS::getCassetteSequenceNo() const
{
return m_nCassetteSequenceNo;
}
@@ -153,7 +153,7 @@
m_nCassetteSequenceNo = no;
}
- int CJobDataS::getJobSequenceNo()
+ int CJobDataS::getJobSequenceNo() const
{
return m_nJobSequenceNo;
}
@@ -457,7 +457,7 @@
int CJobDataS::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 256 * 2) return -1;
+ if (nBufferSize < JOBDATAS_SIZE) return -1;
int index = 0;
memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
@@ -558,7 +558,7 @@
memcpy(&pszBuffer[index], &m_nProductJudge, sizeof(short));
index += sizeof(short);
- return 256 * 2;
+ return JOBDATAS_SIZE;
}
int CJobDataS::unserialize(const char* pszBuffer, int nBufferSize)
@@ -618,9 +618,9 @@
index += sizeof(short);
memcpy(&m_nQTime[1], &pszBuffer[index], sizeof(short));
- index += sizeof(int);
+ index += sizeof(short);
- memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(int));
+ memcpy(&m_nQTime[2], &pszBuffer[index], sizeof(short));
index += sizeof(short);
memcpy(&m_nQTimeOverFlag, &pszBuffer[index], sizeof(short));
--
Gitblit v1.9.3