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/UserManagerDlg.h | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/BondEq/View/UserManagerDlg.h b/SourceCode/Bond/BondEq/View/UserManagerDlg.h
index 3f0ac6a..545a019 100644
--- a/SourceCode/Bond/BondEq/View/UserManagerDlg.h
+++ b/SourceCode/Bond/BondEq/View/UserManagerDlg.h
@@ -1,10 +1,11 @@
锘�#pragma once
#include "afxdialogex.h"
#include "GridCtrl.h"
+#include "CBaseDlg.h"
// CUserManagerDlg 瀵硅瘽妗�
-class CUserManagerDlg : public CDialogEx
+class CUserManagerDlg : public CBaseDlg
{
DECLARE_DYNAMIC(CUserManagerDlg)
@@ -23,15 +24,11 @@
void AddRow(CGridCtrl* pGridCtrl);
void DeleteSelectedRow(CGridCtrl* pGridCtrl);
bool IsUsernameDuplicate(const CString& username);
- void AdjustControls(int nWidth, int nHeight);
- void AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight);
private:
- int m_nInitialWidth;
- int m_nInitialHeight;
std::map<CString, CString> m_mapRoleDescriptions;
-private:
+ // 鎺т欢
CGridCtrl m_gridUserManager;
protected:
@@ -40,7 +37,6 @@
DECLARE_MESSAGE_MAP()
public:
virtual BOOL OnInitDialog();
- afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnGridComboSelChange(NMHDR* pNMHDR, LRESULT* pResult);
afx_msg void OnBnClickedButtonAdd();
afx_msg void OnBnClickedButtonInsert();
--
Gitblit v1.9.3