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/View/AxisDetailSettingsDlg.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
index c3422e7..181b34e 100644
--- a/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
+++ b/SourceCode/Bond/BondEq/View/AxisDetailSettingsDlg.h
@@ -1,11 +1,12 @@
 锘�#pragma once
 #include "afxdialogex.h"
 #include "GridCtrl.h"
+#include "CBaseDlg.h"
 
 
 // CAxisDetailSettingsDlg 瀵硅瘽妗�
 
-class CAxisDetailSettingsDlg : public CDialogEx
+class CAxisDetailSettingsDlg : public CBaseDlg
 {
 	DECLARE_DYNAMIC(CAxisDetailSettingsDlg)
 
@@ -25,12 +26,11 @@
 	void InitAnchorPontManager();
 	void FillAnchorPontManager();
 	void UpdateAxisDetailSettings();
-
+	bool ParsePLCAddress(const CString& address, MC::SOFT_COMPONENT& component, int& addr);
+	void writeAxisDataToPLC(int nAxisId);
 
 private:
 	CPLC* m_pPLC;
-	int m_nInitialWidth;
-	int m_nInitialHeight;
 
 	// 鏁版嵁
 	int m_nAxisNO;

--
Gitblit v1.9.3