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/Servo/CPanelAttributes.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPanelAttributes.cpp b/SourceCode/Bond/Servo/CPanelAttributes.cpp
index 1c33774..611ebac 100644
--- a/SourceCode/Bond/Servo/CPanelAttributes.cpp
+++ b/SourceCode/Bond/Servo/CPanelAttributes.cpp
@@ -59,6 +59,7 @@
 	SetDlgItemText(IDC_LABEL_TITLE, pStep->getName().c_str());
 	SERVO::CAttributeVector attrubutes;
 	pStep->getAttributeVector(attrubutes);
+	attrubutes.sortWithWeight();
 	unsigned int nSize = attrubutes.size();
 	for (unsigned int i = 0; i < nSize; i++) {
 		SERVO::CAttribute* pAttribute = attrubutes.getAttribute(i);
@@ -161,7 +162,7 @@
 	y += 8;
 
 
-	GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 13, rcClient.Height() - 3 - y);
+	GetDlgItem(IDC_MFCPROPERTYGRID1)->MoveWindow(5, y, rcClient.Width() - 8, rcClient.Height() - 3 - y);
 }
 
 #define ATTRIBUTES_PANEL_MIN_WIDTH		88

--
Gitblit v1.9.3