From 5bcbdac9793e19713d41b58c9eeefbd0818d192b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 06 五月 2025 16:50:05 +0800
Subject: [PATCH] 1.暂存配方参数获取

---
 SourceCode/Bond/Servo/CEquipment.h |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index ba1416f..0b66f2f 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -20,10 +20,13 @@
 #include "CEqJobEventStep.h"
 #include "CEqVcrEventStep.h"
 #include "CEqCurrentRecipeChangeStep.h"
+#include "CEqWriteStep.h"
+#include "CEqReadStep.h"
 #include <vector>
 #include <map>
 #include <list>
 #include "CGlass.h"
+#include "CRecipesManager.h"
 
 
 namespace SERVO {
@@ -94,6 +97,7 @@
 		virtual void init();
 		virtual void term();
 		virtual void initPins() = 0;
+		virtual void initSteps();
 		virtual void onTimer(UINT nTimerid);
 		virtual void serialize(CArchive& ar);
 		virtual void onReceiveLBData(const char* pszData, size_t size);
@@ -124,6 +128,17 @@
 		int setCimMessage(const char* pszMessage, short id, short nTouchPanelNo);
 		int clearCimMessage(short id, short nTouchPanelNo);
 		int setDateTime(short year, short month, short day, short hour, short minute, short second);
+		
+		// 请求主配方列表
+		// unitNo: 0:local; Others:unit No
+		int masterRecipeListRequest(short unitNo);
+
+		// 请求配方参数
+		// masterRecipeId: 主配方id
+		// localRecipeId: 本地配方id
+		// unitNo: 0:local; Others:unit No
+		int recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo);
+
 
 	// 以下为从CC-Link读取到的Bit标志位检测函数
 	public:
@@ -141,6 +156,8 @@
 		BOOL isBitOn(const char* pszData, size_t size, int index);
 		inline BOOL equalBool(BOOL b1, BOOL b2);
 		void addGlassToList(CGlass* pGlass);
+		short decodeRecipeListReport(const char* pszData, size_t size);
+		short decodeRecipeParameterReport(const char* pszData, size_t size);
 
 	protected:
 		EquipmentListener m_listener;
@@ -170,6 +187,7 @@
 		CCCLinkIEControl* m_pCclink;
 		std::map<unsigned int, CStep*> m_mapStep;
 		int m_nBaseAlarmId;
+		CRecipesManager m_recipesManager;
 	};
 }
 

--
Gitblit v1.9.3