From e9c66dce803984d9eb0c026df8f50ad196fd0650 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 22 七月 2025 16:20:25 +0800
Subject: [PATCH] 1.将原来的设置CassetteType更新到EFEM的功能，修改为本地保存，因为EFEM不需要这些数据； 2.配置是否需要比较map的一致性； 3.收到EFEM的PortStarus，INUSE状态时，弹出配置对话框；打勾选择要加工的产品；
---
SourceCode/Bond/Servo/PortConfigurationDlg.cpp | 162 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 57 deletions(-)
diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.cpp b/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
index 895648a..891aaac 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
@@ -19,11 +19,21 @@
CPortConfigurationDlg::CPortConfigurationDlg(CWnd* pParent /*=nullptr*/)
: CDialogEx(IDD_DIALOG_PORT_CONFIGURATION, pParent)
{
-
+ // 鍒濆鍖栨垚鍛樺彉閲�
+ m_pPort[0] = dynamic_cast<SERVO::CLoadPort*>(theApp.m_model.m_master.getEquipment(EQ_ID_LOADPORT1));
+ m_pPort[1] = dynamic_cast<SERVO::CLoadPort*>(theApp.m_model.m_master.getEquipment(EQ_ID_LOADPORT2));
+ m_pPort[2] = dynamic_cast<SERVO::CLoadPort*>(theApp.m_model.m_master.getEquipment(EQ_ID_LOADPORT3));
+ m_pPort[3] = dynamic_cast<SERVO::CLoadPort*>(theApp.m_model.m_master.getEquipment(EQ_ID_LOADPORT4));
+ m_nCurSelPort = -1;
}
CPortConfigurationDlg::~CPortConfigurationDlg()
{
+}
+
+void CPortConfigurationDlg::setCurSelPort(int sel)
+{
+ m_nCurSelPort = sel;
}
int CPortConfigurationDlg::GetLoadPortEqID(const std::string& strPortName)
@@ -35,6 +45,54 @@
return -1; // 鏈煡绔彛
}
+void CPortConfigurationDlg::LoadPortConfigToUI(SERVO::CLoadPort* pPort)
+{
+ if (!pPort) {
+ return;
+ }
+
+ SetDlgItemText(IDC_EDIT_LOTID, "");
+ SetDlgItemText(IDC_EDIT_PRODUCTID, "");
+ SetDlgItemText(IDC_EDIT_OPERATIONID, "");
+ m_comboMaterialsType.SetCurSel(0);
+
+ bool bJobInfoSet = false;
+ for (int i = 0; i < SLOT_MAX; ++i) {
+ SERVO::CSlot* pSlot = pPort->getSlot(i);
+ if (!pSlot) {
+ continue;
+ }
+
+
+ // 璁剧疆 Panel ID 鍜屽嬀閫夋
+ SERVO::CGlass* pGlass = dynamic_cast<SERVO::CGlass*>(pSlot->getContext());
+ int nRow = i + 1;
+ if (pGlass != nullptr) {
+ m_wndGrid.SetItemState(nRow, 0, GVIS_READONLY);
+ m_wndGrid.SetItemText(nRow, 0, pSlot->getName().c_str());
+ m_wndGrid.SetCellType(nRow, 1, RUNTIME_CLASS(CGridCellCheck));
+ CGridCellCheck* pCheck = dynamic_cast<CGridCellCheck*>(m_wndGrid.GetCell(nRow, 1));
+ ASSERT(pCheck);
+ pCheck->SetCheck(pGlass->isScheduledForProcessing());
+ pCheck->SetText(pGlass->getID().c_str());
+ }
+ m_wndGrid.SetItemData(nRow, 0, (LPARAM)pGlass);
+
+
+ // 鍥炲～ Job 淇℃伅锛堝彧鍙栫涓�涓湁鏁� Glass锛�
+ if (!bJobInfoSet && pGlass) {
+ SERVO::CJobDataS* pJS = pGlass->getJobDataS();
+ if (pJS) {
+ SetDlgItemText(IDC_EDIT_LOTID, CString(pJS->getLotId().c_str()));
+ SetDlgItemText(IDC_EDIT_PRODUCTID, CString(pJS->getProductId().c_str()));
+ SetDlgItemText(IDC_EDIT_OPERATIONID, CString(pJS->getOperationId().c_str()));
+ m_comboMaterialsType.SetCurSel(pJS->getMaterialsType() - 1);
+ bJobInfoSet = true;
+ }
+ }
+ }
+}
+
void CPortConfigurationDlg::InitGrid()
{
if (m_wndGrid.GetSafeHwnd() == NULL) {
@@ -43,7 +101,7 @@
const int nCols = 2;
const int nFixRows = 1;
- const int nRows = 9;
+ const int nRows = SLOT_MAX + 1; // 瀛樺湪琛ㄥご锛屾墍浠� +1
int nColIdx = 0;
m_wndGrid.DeleteAllItems();
@@ -64,8 +122,6 @@
// 璁剧疆鍒楀
m_wndGrid.SetColumnWidth(nColIdx, 50);
m_wndGrid.SetItemText(0, nColIdx++, _T("Slot ID"));
- m_wndGrid.SetColumnWidth(nColIdx, 150);
- m_wndGrid.SetItemText(0, nColIdx++, _T("Panel ID"));
m_wndGrid.SetColumnWidth(nColIdx, 60);
m_wndGrid.SetItemText(0, nColIdx++, _T("鍚敤"));
@@ -90,33 +146,6 @@
for (int i = 0; i < nRows; ++i) {
m_wndGrid.SetRowHeight(i, nEachRowHeight);
}
-
- FillGrid();
-}
-
-void CPortConfigurationDlg::FillGrid()
-{
- //CStringArray recipeOptions;
- //recipeOptions.Add(_T("Recipe A"));
- //recipeOptions.Add(_T("Recipe B"));
- //recipeOptions.Add(_T("Recipe C"));
-
- for (int i = 1; i < 9; ++i) {
- CString strIndex;
- strIndex.Format(_T("%d"), i);
- m_wndGrid.SetItemText(i, 0, strIndex);
- m_wndGrid.SetItemState(i, 0, GVIS_READONLY);
-
- // Checkbox
- m_wndGrid.SetCellType(i, 1, RUNTIME_CLASS(CGridCellCheck));
- CGridCellCheck* pCheck = static_cast<CGridCellCheck*>(m_wndGrid.GetCell(i, 1));
- if (pCheck) {
- pCheck->SetCheck(FALSE);
- }
- }
-
- m_wndGrid.Invalidate();
- m_wndGrid.UpdateWindow();
}
void CPortConfigurationDlg::DoDataExchange(CDataExchange* pDX)
@@ -130,6 +159,7 @@
BEGIN_MESSAGE_MAP(CPortConfigurationDlg, CDialogEx)
+ ON_CBN_SELCHANGE(IDC_COMBO_PORT, &CPortConfigurationDlg::OnSelchangeComboPort)
ON_BN_CLICKED(IDC_BUTTON_APPLY, &CPortConfigurationDlg::OnBnClickedButtonApply)
END_MESSAGE_MAP()
@@ -146,7 +176,13 @@
for (const auto& item : ports) {
m_comboPort.AddString(item);
}
- m_comboPort.SetCurSel(0); // 榛樿閫夋嫨绗竴涓鍙�
+ if (0 <= m_nCurSelPort && m_nCurSelPort <= 3) {
+ m_comboPort.SetCurSel(m_nCurSelPort);
+ m_comboPort.EnableWindow(FALSE);
+ }
+ else {
+ m_comboPort.SetCurSel(0);
+ }
// 鍒濆鍖栭厤鏂逛笅鎷夋鍐呭
std::vector<std::string> vecRecipe = RecipeManager::getInstance().getAllPPID();
@@ -160,12 +196,37 @@
for (const auto& item : materialTypes) {
m_comboMaterialsType.AddString(item);
}
- m_comboMaterialsType.SetCurSel(0); // 榛樿閫夋嫨绗竴涓墿鏂欑被鍨�
+ m_comboMaterialsType.SetCurSel(0); // 榛樿閫夋嫨绗竴涓墿鏂欑被鍨�
InitGrid();
+ LoadPortConfigToUI(m_pPort[0]); // 榛樿鍔犺浇绗竴涓鍙ｇ殑閰嶇疆
+
+ // 璁剧疆瀵硅瘽妗嗘爣棰�
+ if (0 <= m_nCurSelPort && m_nCurSelPort <= 3) {
+ CString strTitle;
+ strTitle.Format(_T("%s Configuration"), ports[m_nCurSelPort]);
+ SetWindowText(strTitle);
+ }
+ else {
+ SetWindowText(_T("Port Configuration"));
+ }
+
+
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
+
+void CPortConfigurationDlg::OnSelchangeComboPort()
+{
+ // TODO: 鍦ㄦ娣诲姞鎺т欢閫氱煡澶勭悊绋嬪簭浠ｇ爜
+ int selPort = m_comboPort.GetCurSel();
+ if (selPort < 0 || selPort >= 4) {
+ return; // 鏃犳晥閫夋嫨
+ }
+
+ // 鍔犺浇閫変腑绔彛鐨勯厤缃埌 UI
+ LoadPortConfigToUI(m_pPort[selPort]);
}
void CPortConfigurationDlg::OnBnClickedButtonApply()
@@ -224,34 +285,21 @@
// 鑾峰彇 Grid 琛ㄦ牸涓� Slot 鐘舵�侊紙绗�1~8琛岋級
for (int i = 1; i <= 8; ++i) {
- SERVO::SlotConfig slot;
- slot.nSlotID = i;
+ SERVO::CGlass* pGlass = (SERVO::CGlass*)m_wndGrid.GetItemData(i, 0);
+ if (pGlass != nullptr) {
+ CGridCellCheck* pCheck = dynamic_cast<CGridCellCheck*>(m_wndGrid.GetCell(i, 1));
+ ASSERT(pCheck);
+ pGlass->setScheduledForProcessing(pCheck->GetCheck());
+ pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));
- CGridCellCheck* pCheck = static_cast<CGridCellCheck*>(m_wndGrid.GetCell(i, 1));
- if (pCheck) {
- slot.isEnabled = pCheck->GetCheck();
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ pJobDataS->setLotId(config.strLotID.c_str());
+ pJobDataS->setProductId(config.strProductID.c_str());
+ pJobDataS->setOperationId(config.strOperationID.c_str());
+ pJobDataS->setMaterialsType(config.nMaterialType);
}
-
- config.vecSlot.push_back(slot);
}
- int nEqID = GetLoadPortEqID(config.strPortName);
- if (nEqID < 0) {
- AfxMessageBox(_T("鏈煡鐨勭鍙ｅ悕绉帮紒"));
- return;
- }
-
- SERVO::CLoadPort* pPort = dynamic_cast<SERVO::CLoadPort*>(theApp.m_model.m_master.getEquipment(nEqID));
- if (!pPort) {
- AfxMessageBox(_T("鎵句笉鍒板搴旂殑 LoadPort 璁惧锛�"));
- return;
- }
-
- // 搴旂敤閰嶇疆锛堜緥濡傛祴璇曠敓鎴愮幓鐠冿級
- if (pPort->testGenerateGlassListFromConfig(config) < 0) {
- AfxMessageBox(_T("Failed to generate glass list from configuration!"));
- return;
- }
OnOK();
}
\ No newline at end of file
--
Gitblit v1.9.3