From 867888458abdc029cbf31b6058edfefe30a20722 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 16:38:24 +0800
Subject: [PATCH] 1.修复重启后，由于PJ不是列队中，导致无法创建调度任务的问题。 2.修复CPjPage2点Port2的物料类型，Port1也跟着变的问题。
---
SourceCode/Bond/Servo/CPortStatusReport.cpp | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPortStatusReport.cpp b/SourceCode/Bond/Servo/CPortStatusReport.cpp
index 0a0453d..a3cafdd 100644
--- a/SourceCode/Bond/Servo/CPortStatusReport.cpp
+++ b/SourceCode/Bond/Servo/CPortStatusReport.cpp
@@ -10,6 +10,7 @@
{
m_nPortStatus = 0;
m_nCassetteSequenceNo = 0;
+ memset(m_nJobExistenceSlot, 0, sizeof(m_nJobExistenceSlot));
m_nLoadingCassetteType = 0;
m_nQTimeFlag = 0;
m_nCassetteMappingState = 0;
@@ -27,11 +28,9 @@
m_nCassetteSequenceNo = other.m_nCassetteSequenceNo;
m_strCassetteID = other.m_strCassetteID;
- // Job Existence Slot
- if (PORT_INUSE == m_nPortStatus) {
- for (int i = 0; i < 12; i++) {
- m_nJobExistenceSlot[i] = other.m_nJobExistenceSlot[i];
- }
+ // Job Existence Slot: always copy to avoid stale/uninitialized map
+ for (int i = 0; i < 12; i++) {
+ m_nJobExistenceSlot[i] = other.m_nJobExistenceSlot[i];
}
if (!m_strCassetteID.empty()) {
@@ -101,7 +100,7 @@
memcpy(&pszBuffer[index], m_strCassetteID.c_str(), strLen);
index += 20;
- memcpy(&pszBuffer[index], &m_nJobExistenceSlot[0], sizeof(short));
+ memcpy(&pszBuffer[index], &m_nJobExistenceSlot[0], sizeof(short) * 12);
index += 12 * sizeof(short);
memcpy(&pszBuffer[index], &m_nLoadingCassetteType, sizeof(short));
@@ -133,11 +132,8 @@
CToolUnits::convertString(&pszBuffer[index], 20, m_strCassetteID);
index += 20;
- memcpy(&m_nJobExistenceSlot[0], &pszBuffer[index], sizeof(short));
+ memcpy(&m_nJobExistenceSlot[0], &pszBuffer[index], sizeof(short) * 12);
index += 12 * sizeof(short);
-
- memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
- index += sizeof(short);
memcpy(&m_nLoadingCassetteType, &pszBuffer[index], sizeof(short));
index += sizeof(short);
@@ -252,6 +248,11 @@
m_nJobExistenceSlot[0] = map;
}
+ void CPortStatusReport::setCassetteId(const char* pszId)
+ {
+ m_strCassetteID = pszId;
+ }
+
void CPortStatusReport::WriteString(CArchive& ar, std::string& string)
{
CString strTemp = string.c_str();
--
Gitblit v1.9.3