From 349f26accd28cd83356334239b11728ce50b7f95 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 14 五月 2025 18:10:21 +0800
Subject: [PATCH] 1.重新理顺Glass的流转，CJobDataB, CJobDataS在CEquipment的列表存储等；
---
SourceCode/Bond/Servo/CFliper.cpp | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CFliper.cpp b/SourceCode/Bond/Servo/CFliper.cpp
index acd7654..cdc0431 100644
--- a/SourceCode/Bond/Servo/CFliper.cpp
+++ b/SourceCode/Bond/Servo/CFliper.cpp
@@ -67,4 +67,29 @@
return m_glassList.empty();
}
+
+ BOOL CFliper::onPreStoredJob(int port, CJobDataB* pJobDataB)
+ {
+ CJobDataS* pJobDataS = getJobDataS(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ if (pJobDataS == nullptr) {
+ LOGE("<CEquipment-%s>onPreFetchedOutJob,找不到对应的JobDataS(CassetteSequenceNo:%d, JobSequenceNo:%d), 注意排查风险!", m_strName.c_str(),
+ pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ return FALSE;
+ }
+
+ // 当前不能有任何玻璃，且当前准备进的片是G2
+ Lock();
+ if (!m_glassList.empty()) {
+ Unlock();
+ LOGE("<CEquipment-%s>onPreFetchedOutJob,当前机器或单元存在玻璃片，不能进料，请注意风险！", m_strName.c_str());
+ return FALSE;
+ }
+
+ if (pJobDataS->getMaterialsType() != (int)MaterialsType::G2) {
+ LOGE("<CEquipment-%s>onPreFetchedOutJob,当前机器或单元只能进G2玻璃片，请注意风险！", m_strName.c_str());
+ return FALSE;
+ }
+
+ return TRUE;
+ }
}
--
Gitblit v1.9.3