From d24917a7422efa5aa1d3cff2ef70ad754cebaedf Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 19 六月 2025 11:31:00 +0800
Subject: [PATCH] 1.生成玻璃的JobDataS数据，采用新的JobNo等id
---
SourceCode/Bond/Servo/CArm.cpp | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index cf6320e..7ca9be1 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -41,10 +41,6 @@
m_slot[0].setPosition(m_nID);
m_slot[0].setNo(1);
m_slot[0].setName("Slot 1(Temp)");
- m_slot[1].enable();
- m_slot[1].setPosition(m_nID);
- m_slot[1].setNo(2);
- m_slot[1].setName("Slot 2(Temp)");
}
void CArm::onTimer(UINT nTimerid)
@@ -70,22 +66,14 @@
int CArm::tempStore(CGlass* pGlass)
{
// 原：保证列表中只存储一个物料
- // 修改为：先清空之前的，再添加当前pGlass, 如果pGlass有buddy，也要加入列表中
+ // 修改为：先清空之前的，再添加当前pGlass
Lock();
CGlass* pPreviousGlass;
pPreviousGlass = (CGlass*)m_slot[0].getContext();
if (pPreviousGlass != nullptr) {
pPreviousGlass->release();
}
- pPreviousGlass = (CGlass*)m_slot[1].getContext();
- if (pPreviousGlass != nullptr) {
- pPreviousGlass->release();
- }
-
m_slot[0].setContext(pGlass);
- if (pGlass->getBuddy() != nullptr) {
- m_slot[1].setContext(pGlass->getBuddy());
- }
Unlock();
if (m_listener.onDataChanged != nullptr) {
@@ -106,10 +94,6 @@
pGlass = pPreviousGlass;
pGlass->addRef();
m_slot[0].setContext(nullptr);
- CGlass* pBuddy = pGlass->getBuddy();
- if (pBuddy != nullptr) {
- m_slot[1].setContext(nullptr);
- }
Unlock();
if (m_listener.onDataChanged != nullptr) {
--
Gitblit v1.9.3