From a1bf060d50da3c27b54bcc349e8b53769b39ef89 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 六月 2025 17:31:33 +0800
Subject: [PATCH] 1.增加Aligner --> Bonder1 | Bonder2的搬送检测逻辑; 2.优化搬送逻辑。搬送要分优先考虑的主类型和次要类型。一种情况,如果不分主次,一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1, Bonder1和Bonder2需要的G2就过不来了(在Aligner阻塞了)。另外从生产效率上来说,也应该根据需求,尽快使其中一台Bonder的两片玻璃匹配以使其能尽快开始生产加工。

---
 SourceCode/Bond/BondEq/CBonder.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BondEq/CBonder.h b/SourceCode/Bond/BondEq/CBonder.h
index 25969f4..b72a3c3 100644
--- a/SourceCode/Bond/BondEq/CBonder.h
+++ b/SourceCode/Bond/BondEq/CBonder.h
@@ -34,6 +34,7 @@
 	ONRECVBROADCAST			onRecvBroadcast;
 } BondListener;
 
+class CModel;
 class CBonder
 {
 public:
@@ -45,6 +46,7 @@
 	void setListener(BondListener& listener);
 	void setWorkDir(const char* pszWorkDir);
 	const std::vector<CComponent*>& getComponents();
+	void setModel(CModel* pModel);
 	CPLC* getPLC(const char* pszName);
 	int init();
 	int term();
@@ -69,6 +71,10 @@
 	int loadReady(BEQ::IUnit* pUnit, const char* pszMaterielId, const char* pszRecipeId);
 	int loadComplete(BEQ::IUnit* pUnit, int layer);
 	int unloadComplete(BEQ::IUnit* pUnit, int layer);
+	double getTackTime();
+	bool isMute();
+	void setMute(bool bMute);
+	void readTaktTime();
 
 public:
 	int writeInt(int unitId, int addr, int value);
@@ -111,9 +117,18 @@
 	BOOL m_bAreYouThereRequest;
 
 private:
+	CModel* m_pModel;
 	char* m_pPlcData;
 	BEQ::IEquipment* m_pEquipment;
 	std::map<int, CRecipe*> m_recipes;
 	std::string m_strCurRecipeName;
+
+private:
+	bool m_bMute;
+	bool m_bBlBtnsStates[7];	// 主页面按钮状态
+	int m_nVelocityRatio;		// 速度比
+	double m_dTactTime;			// 周期时间
+	int m_nDayShiftCapacity;
+	int m_nNightShiftCapacity;
 };
 

--
Gitblit v1.9.3