From 6b80da0fe2a6053b39802a6701db6df0ab1fde24 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 05 九月 2025 17:27:35 +0800
Subject: [PATCH] 1. 添加设备配方参数显示界面
---
SourceCode/Bond/Servo/CEquipment.h | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 1a35b85..635c7a8 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -35,6 +35,7 @@
#include "CProcessData.h"
#include "CPortStatusReport.h"
#include "CSlot.h"
+#include "CParam.h"
namespace SERVO {
@@ -55,6 +56,7 @@
typedef std::function<BOOL(void* pEiuipment, int port, CJobDataB* pJobDataB, short& putSlot)> ONPRESTOREDJOB;
typedef std::function<void(void* pEiuipment, PROCESS_STATE state)> ONPROCESSSTATE;
typedef std::function<void(void* pEiuipment, short scanMap, short downMap)> ONMAPMISMATCH;
+ typedef std::function<void(void* pEiuipment, short status, __int64 data)> ONPORTSTATUSCHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
@@ -66,6 +68,8 @@
ONPRESTOREDJOB onPreStoredJob;
ONPROCESSSTATE onProcessStateChanged;
ONMAPMISMATCH onMapMismatch;
+ ONPORTSTATUSCHANGED onPortStatusChanged;
+
} EquipmentListener;
@@ -119,6 +123,8 @@
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
CRecipeList* getRecipeList(int unitNo);
+ bool saveRecipeList(int unitNo, std::string& strFilepath);
+ bool readRecipeList(int unitNo, std::string& strFilepath);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
virtual int fetchedOutJob(int port, CJobDataB* pJobDataB);
virtual int storedJob(int port, CJobDataB* pJobDataB, short putSlot);
@@ -162,7 +168,11 @@
// masterRecipeId: 主配方id
// localRecipeId: 本地配方id
// unitNo: 0:local; Others:unit No
- int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
+ int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo, ONSYNCINGSTATECHANGED block);
+
+ // 解析配方参数列表
+ virtual int parsingParams(const char* pszData, size_t size, std::vector<CParam>& params) { return 0; };
+ virtual int parsingParams(const char* pszData, size_t size, std::string& strOut);
// 获取指定的Slot
CSlot* getSlot(int index);
@@ -173,6 +183,7 @@
// 获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass(MaterialsType type);
CSlot* getAvailableSlotForGlassExcludeSignal(MaterialsType type);
+ CSlot* isSlotAvailable(unsigned int slot);
// 在指定的槽列表中，获取一个指定物料类型(G1,G2,G1&G2)的空槽位
CSlot* getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates);
@@ -181,9 +192,10 @@
CSlot* getNonEmptySlot(MaterialsType type);
// 获取一个指定物料类型(G1,G2,G1&G2)的且已经加工处理的槽位
- CSlot* getProcessedSlot(MaterialsType putSlotType);
+ CSlot* getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode = FALSE);
CSlot* getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates);
CSlot* getInspFailSlot();
+ CSlot* getProcessedSlotCt(unsigned int slot);
// 获取玻璃物料
CGlass* getGlassFromSlot(int slotNo);
@@ -197,6 +209,7 @@
// 是否有玻璃
BOOL hasGlass();
+ BOOL slotHasGlass(int slotIndex = 0);
// 指定槽位是否可以放置玻璃
BOOL canPlaceGlassInSlot(const short slotIndex);
@@ -248,6 +261,7 @@
int decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size);
BOOL compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS);
void setProcessState(PROCESS_STATE state);
+ float toFloat(const char* pszAddr);
protected:
BOOL m_bEnable;
@@ -285,6 +299,9 @@
private:
CEquipment* m_pArm;
+
+ public:
+ int m_nTestFlag;
};
}
--
Gitblit v1.9.3