From b7d98aad7e8728c5a41c6fab5a21b6c633042527 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 11:43:13 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 984fa26..aef0b77 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -34,6 +34,7 @@
ON_WM_SIZE()
ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST1, &CEquipmentPage2::OnLvnItemchangedList1)
ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CEquipmentPage2::OnBnClickedButtonRemove)
+ ON_BN_CLICKED(IDC_BUTTON_PUT, &CEquipmentPage2::OnBnClickedButtonPut)
END_MESSAGE_MAP()
@@ -125,10 +126,17 @@
GetClientRect(&rcClient);
int x = 12;
+ int x1 = x;
int y2 = rcClient.bottom - 12;
pItem = GetDlgItem(IDC_BUTTON_REMOVE);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x1 += rcItem.Width();
+ x1 += 12;
+
+ pItem = GetDlgItem(IDC_BUTTON_PUT);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x1, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
y2 -= rcItem.Height();
y2 -= 8;
@@ -160,9 +168,24 @@
if (index >= 0) {
SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
ASSERT(pSlot);
- int bRet = m_pEquipment->removeGlass(pSlot->getNo());
- if (bRet == 0) {
+ if (theApp.m_model.getMaster().moveGlassToBuf(m_pEquipment->getID(),
+ pSlot->getNo())) {
UpdateSlots();
+ AfxMessageBox("鐗╂枡宸插彇鍑哄埌Buffer涓紒");
+ }
+ }
+}
+
+void CEquipmentPage2::OnBnClickedButtonPut()
+{
+ int index = GetSelectedItemIndex();
+ if (index >= 0) {
+ SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
+ ASSERT(pSlot);
+ if (theApp.m_model.getMaster().moveGlassToSlot(m_pEquipment->getID(),
+ pSlot->getNo())) {
+ UpdateSlots();
+ AfxMessageBox("鐗╂枡宸叉斁鍏ユ寚瀹氫綅缃紒");
}
}
}
@@ -199,4 +222,3 @@
}
}
}
-
--
Gitblit v1.9.3