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/CJobDataS.h | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CJobDataS.h b/SourceCode/Bond/Servo/CJobDataS.h
index e0a8cb8..07ea074 100644
--- a/SourceCode/Bond/Servo/CJobDataS.h
+++ b/SourceCode/Bond/Servo/CJobDataS.h
@@ -1,7 +1,8 @@
#pragma once
#include "CAttributeVector.h"
+#include "CJobDataB.h"
-
+#define DEVICE_COUNT 15
#define JOBDATAS_SIZE (256 * 2)
namespace SERVO {
class CJobDataS
@@ -16,9 +17,10 @@
void setOwner(void* pOwner);
void copy(CJobDataS* pScr);
void update(CJobDataS* pScr);
- int getCassetteSequenceNo();
+ CJobDataB& getJobDataB(CJobDataB& jobDataB);
+ int getCassetteSequenceNo() const;
void setCassetteSequenceNo(int no);
- int getJobSequenceNo();
+ int getJobSequenceNo() const;
void setJobSequenceNo(int no);
std::string& getLotId();
void setLotId(const char* pszId);
@@ -54,12 +56,10 @@
void setQTimeOverFlag(int flag);
int getMasterRecipe();
void setMasterRecipe(int recipe);
- std::string& getProductRecipeId();
- void setProductRecipeId(const char* pszId);
- std::string& getPCode();
- void setPCode(const char* pszCode);
- std::string& getUseType();
- void setUseType(const char* pszType);
+ short getDeviceRecipeId(int nDeviceIndex) const;
+ void setDeviceRecipeId(int nDeviceIndex, short nRecipeId);
+ const short* getRecipeIds() const;
+ void setRecipeIds(const short* pIds, int nCount);
std::string& getPanelMeasure();
void setPanelMeasure(const char* pszMeasure);
int getMode();
@@ -74,6 +74,8 @@
void setTargetPortNo(int no);
int getTargetSlotNo();
void setTargetSlotNo(int no);
+ short getProductJudge() const;
+ void setProductJudge(short nProductJudge);
int serialize(char* pszBuffer, int nBufferSize);
int unserialize(const char* pszBuffer, int nBufferSize);
void getAttributeVector(CAttributeVector& attrubutes, int beginWeight);
@@ -100,9 +102,7 @@
int m_nQTime[3];
int m_nQTimeOverFlag;
int m_nMasterRecipe;
- std::string m_strProductRecipeId;
- std::string m_strPCode;
- std::string m_strUseType;
+ short m_nRecipeIds[DEVICE_COUNT];
std::string m_strPanelMeasure;
int m_nMode;
int m_nSlotUnitSelectFlag;
@@ -110,6 +110,7 @@
int m_nSourceSlotNo;
int m_nTargetPortNo;
int m_nTargetSlotNo;
+ short m_nProductJudge;
private:
char* m_pRawData;
--
Gitblit v1.9.3