From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 7560957..bfdec30 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1325,7 +1325,7 @@
return nullptr;
}
- CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType)
+ CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode/* = FALSE*/)
{
for (int i = 0; i < SLOT_MAX; i++) {
if (!m_slot[i].isEnable()) continue;
@@ -1334,6 +1334,7 @@
if (!isSlotProcessed(i)) continue;
if (pGlass == nullptr) continue;
if (!pGlass->isScheduledForProcessing()) continue;
+ if (bJobMode && pGlass->getProcessJob() == nullptr) continue;
if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue;
int lsPath = m_slot[i].getLinkSignalPath();
if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
@@ -1654,7 +1655,7 @@
int CEquipment::decodeVCREventReport(CStep* pStep, const char* pszData, size_t size)
{
CVcrEventReport vcrEventReport;
- vcrEventReport.unserialize(pszData, size);
+ vcrEventReport.unserialize(pszData, (int)size);
LOGI("<CEquipment-%s>decodeVCREventReport<Result:%d, GlassId:%s>\n", m_strName.c_str(),
vcrEventReport.getVcrResult(),
vcrEventReport.getGlassId().c_str());
--
Gitblit v1.9.3