feat<central_clearing_system>:修改下单页面

修改下单页面enter键作用。

feat<central_clearing_system>:修改下单页面
修改下单页面enter键作用。
liuye
1 parent cf153888
Showing 6 changed files with 177 additions and 99 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.h
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
central_clearing_system/Resource.h
@@ -155,9 +155,10 @@ END
 IDR_ACCELERATOR_PAY ACCELERATORS
 BEGIN
-    "X",            ID_ACCELERATOR_X,       VIRTKEY, NOINVERT
     "F",            ID_ACCELERATOR_F,       VIRTKEY, NOINVERT
-    "S",            ID_ACCELERATOR_S,       VIRTKEY, NOINVERT
+    "A",            ID_ACCELERATOR_A,       VIRTKEY, NOINVERT
+    "X",            ID_ACCELERATOR_X,       VIRTKEY, NOINVERT
+    VK_RETURN,      ID_ACCELERATOR_ENTER,   VIRTKEY, NOINVERT
 END
@@ -20,6 +20,7 @@
 #include "ETradeClient/utility/logging.h"
 #include <sstream>
 #include "LoginDialog.h"
+#include "place_order_dlg.h"
 // PayDlg ¶Ô»°¿ò
@@ -57,9 +58,10 @@ BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PAY, &PayDlg::OnBnClickedPayButtonPay)
 	ON_WM_CTLCOLOR()
 	ON_BN_CLICKED(IDC_PAY_BUTTON_PASSWORD, &PayDlg::OnBnClickedPayButtonPassword)
-	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonPassword)
+	ON_COMMAND(ID_ACCELERATOR_A, &PayDlg::OnBnClickedPayButtonPassword)
 	ON_COMMAND(ID_ACCELERATOR_F, &PayDlg::OnBnClickedPayButtonPay)
-	ON_COMMAND(ID_ACCELERATOR_S, &PayDlg::OnBnClickedPayButtonClose)
+	ON_COMMAND(ID_ACCELERATOR_X, &PayDlg::OnBnClickedPayButtonClose)
+	ON_COMMAND(ID_ACCELERATOR_ENTER, &PayDlg::OnBnClickedEnter)
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, &PayDlg::OnSessionExpired)
 END_MESSAGE_MAP()
@@ -80,12 +82,14 @@ BOOL PayDlg::OnInitDialog()
 		password_static_.ShowWindow(SW_HIDE);
 		password_edit_.ShowWindow(SW_HIDE);
 		password_button_.ShowWindow(SW_HIDE);
+		pay_button_.SetFocus();
 	}
 	else
 	{
 		password_static_.ShowWindow(SW_SHOW);
 		password_edit_.ShowWindow(SW_SHOW);
 		password_button_.ShowWindow(SW_SHOW);
+		password_button_.SetFocus();
 	}
 	acce_ = LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_ACCELERATOR_PAY));
@@ -374,3 +378,38 @@ LRESULT PayDlg::OnSessionExpired(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
+void PayDlg::OnBnClickedEnter()
+{
+	int item_id = GetFocus()->GetDlgCtrlID();
+
+	switch (item_id)
+	{
+	case IDC_PAY_BUTTON_PASSWORD:
+	{
+		OnBnClickedPayButtonPassword();
+		CString error;
+		error_msg_static_.GetWindowText(error);
+		if (error.IsEmpty())
+		{
+			pay_button_.SetFocus();
+		}
+		else
+		{
+			password_button_.SetFocus();
+		}
+		break;
+	}
+	case IDC_PAY_BUTTON_PAY:
+	{
+		OnBnClickedPayButtonPay();
+		break;
+	}
+	case IDC_PAY_BUTTON_CLOSE:
+	{
+		OnBnClickedPayButtonClose();
+		break;
+	}
+		
+	}
+
+}
@@ -28,6 +28,7 @@ public:
 	afx_msg LRESULT OnSessionExpired(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnBnClickedPayButtonPassword();
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnBnClickedEnter();
 private:
 	void SetCtrlPos();
@@ -100,7 +100,8 @@ BOOL PlaceOrderDlg::OnInitDialog()
 	InitList();
 	acce_ = LoadAccelerators(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_ACCELERATOR_ORDER));
-	
+
+	swip_card_button_.SetFocus();
 	return FALSE;  // return TRUE unless you set the focus to a control
 	// 异常:  OCX 属性页应返回 FALSE
 }
@@ -594,109 +595,121 @@ int PlaceOrderDlg::GetCommIndex()
 void PlaceOrderDlg::OnAcceleratorEnter()
 {
-	OnEditKillFocus(IDC_EDIT_CARD, NULL);
-	OnEditKillFocus(IDC_EDIT_COMM_NUM, NULL);
-	OnEditKillFocus(IDC_EDIT_UNIT, NULL);
-	OnEditKillFocus(IDC_EDIT_HEAVY, NULL);
-	OnEditKillFocus(IDC_EDIT_PRICE, NULL);
-	OnEditKillFocus(IDC_EDIT_COUNT, NULL);
+	int item_id = GetFocus()->GetDlgCtrlID();
+	if (item_id == IDC_BUTTON_SWIP_CARD)
+	{
+		OnBnClickedButtonSwipCard();
+	}
+	else if (item_id == IDC_EDIT_COUNT)
+	{
+		OnEditKillFocus(IDC_EDIT_CARD, NULL);
+		OnEditKillFocus(IDC_EDIT_COMM_NUM, NULL);
+		OnEditKillFocus(IDC_EDIT_UNIT, NULL);
+		OnEditKillFocus(IDC_EDIT_HEAVY, NULL);
+		OnEditKillFocus(IDC_EDIT_PRICE, NULL);
+		OnEditKillFocus(IDC_EDIT_COUNT, NULL);
-	card_edit_.SetFocus();
+		card_edit_.SetFocus();
-	do 
-	{
-		if (card_edit_.IsEditRed() || comm_num_edit_.IsEditRed() ||
-			unit_edit_.IsEditRed() || (heavy_edit_.IsWindowEnabled() && heavy_edit_.IsEditRed()) ||
-			price_edit_.IsEditRed() || count_edit_.IsEditRed())
+		do
 		{
-			break;
-		}
-		
-		CString text;
-		double price = 0, count = 0;
-		card_edit_.GetWindowText(text);
-		CommInfo comm;
-		comm.comm_id = GetCommIndex();
-		comm.seller_card = text;
-		text.Empty();
-		name_edit_.GetWindowText(text);
-		comm.seller_name = text;
-		text.Empty();
-		comm_name_edit_.GetWindowText(text);
-		comm.comm_name = text;
-		comm.product_id = product_id_;
-		text.Empty();
-		price_edit_.GetWindowText(text);
-		price = _ttof(text);
-		comm.price = text;
-		text.Empty();
-		count_edit_.GetWindowText(text);
-		count = _ttof(text);
-		comm.count = text;
-		text.Empty();
-		real_unit_static.GetWindowText(text);
-		comm.unit = text;
-		text.Empty();
-		heavy_edit_.GetWindowText(text);
-		comm.weight = text;
-		text.Empty();
-
-		double money = price * count * 100;
-		money = std::round(money) / 100;
-
-		text.Format(_T("%.2f"), money);
-		comm.total_money = text;
-		comm_vec_.push_back(comm);
-
-		product_list_.DeleteAllItems();
+			if (card_edit_.IsEditRed() || comm_num_edit_.IsEditRed() ||
+				unit_edit_.IsEditRed() || (heavy_edit_.IsWindowEnabled() && heavy_edit_.IsEditRed()) ||
+				price_edit_.IsEditRed() || count_edit_.IsEditRed())
+			{
+				break;
+			}
-		InitList();
+			CString text;
+			double price = 0, count = 0;
+			card_edit_.GetWindowText(text);
+			CommInfo comm;
+			comm.comm_id = GetCommIndex();
+			comm.seller_card = text;
+			text.Empty();
+			name_edit_.GetWindowText(text);
+			comm.seller_name = text;
+			text.Empty();
+			comm_name_edit_.GetWindowText(text);
+			comm.comm_name = text;
+			comm.product_id = product_id_;
+			text.Empty();
+			price_edit_.GetWindowText(text);
+			price = _ttof(text);
+			comm.price = text;
+			text.Empty();
+			count_edit_.GetWindowText(text);
+			count = _ttof(text);
+			comm.count = text;
+			text.Empty();
+			real_unit_static.GetWindowText(text);
+			comm.unit = text;
+			text.Empty();
+			heavy_edit_.GetWindowText(text);
+			comm.weight = text;
+			text.Empty();
+
+			double money = price * count * 100;
+			money = std::round(money) / 100;
+
+			text.Format(_T("%.2f"), money);
+			comm.total_money = text;
+			comm_vec_.push_back(comm);
+
+			product_list_.DeleteAllItems();
+
+			InitList();
+
+			for (int index = 0; index != comm_vec_.size(); ++index)
+			{
+				int row_index = product_list_.InsertRow(L"", -1);
+				product_list_.SetItemText(row_index, 0, comm_vec_[index].seller_card, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 1, comm_vec_[index].seller_name, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 2, comm_vec_[index].comm_name, comm_vec_[index].comm_id, comm_vec_[index].product_id);
+				product_list_.SetItemText(row_index, 3, comm_vec_[index].price, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 4, comm_vec_[index].count, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 5, comm_vec_[index].unit, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 6, comm_vec_[index].weight, comm_vec_[index].comm_id);
+				product_list_.SetItemText(row_index, 7, comm_vec_[index].total_money, comm_vec_[index].comm_id);
+				for (int index = 0; index < 8; ++index)
+				{
+					product_list_.SetItemFormat(row_index, index, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+				}
+			}
-		for (int index = 0; index != comm_vec_.size(); ++index)
-		{
-			int row_index = product_list_.InsertRow(L"", -1);
-			product_list_.SetItemText(row_index, 0, comm_vec_[index].seller_card, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 1, comm_vec_[index].seller_name, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 2, comm_vec_[index].comm_name, comm_vec_[index].comm_id, comm_vec_[index].product_id);
-			product_list_.SetItemText(row_index, 3, comm_vec_[index].price, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 4, comm_vec_[index].count, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 5, comm_vec_[index].unit, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 6, comm_vec_[index].weight, comm_vec_[index].comm_id);
-			product_list_.SetItemText(row_index, 7, comm_vec_[index].total_money, comm_vec_[index].comm_id);
-			for (int index = 0; index < 8; ++index)
+			EmptyCtrl(false);
+			SortList();
+
+			CString subtotal;
+			double total_price = 0;
+			int list_count = product_list_.GetRowCount();
+			for (int index = 1; index <= list_count; ++index)
 			{
-				product_list_.SetItemFormat(row_index, index, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
+				subtotal = product_list_.GetItemText(index, 7);
+				total_price += _ttof(subtotal);
 			}
-		}
-		
-		EmptyCtrl(false);
-		SortList();
-		CString subtotal;
-		double total_price = 0;
-		int list_count = product_list_.GetRowCount();
-		for (int index = 1; index <= list_count; ++index)
-		{
-			subtotal = product_list_.GetItemText(index, 7);
-			total_price += _ttof(subtotal);
-		}
+			CString total_price_s;
+			total_price_s.Format(L"%.2f", total_price);
+			total_real_money_static_.SetWindowText(total_price_s);
-		CString total_price_s;
-		total_price_s.Format(L"%.2f", total_price);
-		total_real_money_static_.SetWindowText(total_price_s);
+		} while (0);
-	} while (0);
-	
-	if (product_list_.GetRowCount() > 1)
-	{
-		pay_button_.EnableWindow(TRUE);
+		if (product_list_.GetRowCount() > 1)
+		{
+			pay_button_.EnableWindow(TRUE);
+		}
+		else
+		{
+			pay_button_.EnableWindow(FALSE);
+		}
+		product_list_.Invalidate(TRUE);
+		UpdateWindow();
 	}
 	else
 	{
-		pay_button_.EnableWindow(FALSE);
+		OnAcceleratorDown();
 	}
-	product_list_.Invalidate(TRUE);
-	UpdateWindow();
 }
@@ -715,6 +728,8 @@ void PlaceOrderDlg::SetCtrlInitData()
 	card_edit_.SetFocus();
 	card_edit_.SetSel(4, 4);
+
+	unit_edit_.SetWindowText(L"1");
 	heavy_edit_.EnableWindow(FALSE);
 	pay_button_.EnableWindow(FALSE);
 }
@@ -871,6 +886,10 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 					SetErrorMsg(CString(L"错误信息：库存不足"));
 					((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(true);
 				}
+				else
+				{
+					((CEditBox*)GetDlgItem(dlg_id))->SetEditRed(false);
+				}
 			}
 			else
 			{
@@ -1101,6 +1120,7 @@ void PlaceOrderDlg::OnAcceleratorDown()
 	case IDC_EDIT_COMM_NUM:
 	{
 		unit_edit_.SetFocus();
+		unit_edit_.SetSel(0, -1);
 		break;
 	}
 	case IDC_EDIT_UNIT:
@@ -1144,26 +1164,39 @@ void PlaceOrderDlg::OnAcceleratorUp()
 	case IDC_EDIT_COUNT:
 	{
 		price_edit_.SetFocus();
+		price_edit_.SetSel(0, -1);
 		break;
 	}
 	case IDC_EDIT_PRICE:
 	{
-		heavy_edit_.IsWindowEnabled() ? heavy_edit_.SetFocus() : unit_edit_.SetFocus();
+		if (heavy_edit_.IsWindowEnabled())
+		{
+			heavy_edit_.SetFocus();
+			heavy_edit_.SetSel(0, -1);
+		}
+		else
+		{
+			unit_edit_.SetFocus();
+			unit_edit_.SetSel(0, -1);
+		}
 		break;
 	}
 	case IDC_EDIT_HEAVY:
 	{
 		unit_edit_.SetFocus();
+		unit_edit_.SetSel(0, -1);
 		break;
 	}
 	case IDC_EDIT_UNIT:
 	{
 		comm_num_edit_.SetFocus();
+		comm_num_edit_.SetSel(0, -1);
 		break;
 	}
 	case IDC_EDIT_COMM_NUM:
 	{
 		card_edit_.SetFocus();
+		card_edit_.SetSel(0, -1);
 		break;
 	}
 	}
@@ -1238,7 +1271,7 @@ void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer)
 	name_edit_.SetWindowText(L"");
 	comm_num_edit_.SetWindowText(L"");
 	comm_name_edit_.SetWindowText(L"");
-	unit_edit_.SetWindowText(L"");;
+	unit_edit_.SetWindowText(L"1");;
 	real_unit_static.SetWindowText(L"斤");
 	heavy_edit_.SetWindowText(L"");
 	heavy_edit_.EnableWindow(FALSE);
@@ -1348,7 +1381,7 @@ void PlaceOrderDlg::EnableCtrl(bool is_enable)
 		name_edit_.SetWindowTextW(L"");
 		comm_num_edit_.SetWindowTextW(L"");
 		comm_name_edit_.SetWindowTextW(L"");
-		unit_edit_.SetWindowTextW(L"");
+		unit_edit_.SetWindowTextW(L"1");
 		price_edit_.SetWindowTextW(L"");
 		count_edit_.SetWindowTextW(L"");
 	}
@@ -107,7 +107,6 @@ private:
 	CStatic buyer_static_;
 	CEditBox buyer_card_edit_;
 	CEditBox buyer_name_edit_;
-	CButton swip_card_button_;
 	CPen line_pen_;
 	CPoint line_point_[3];
@@ -121,4 +120,7 @@ private:
 	std::vector<CommInfo> comm_vec_;
 	int comm_id_index_;
+
+public:
+	CButton swip_card_button_;
 };
@@ -91,6 +91,8 @@
 #define ID_ACCELERATOR_ALT_S            32884
 #define ID_ACCELERATOR_F                32886
 #define ID_ACCELERATOR_X                32887
+#define ID_ACCELERATOR_A                32895
+#define ID_ACCELERATOR32896             32896
 #define ID_POINT_RULE                   40001
 #define ID_CATEGORY_RULE                40002
 #define ID_AGREEMENT                    40003
@@ -106,7 +108,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        333
-#define _APS_NEXT_COMMAND_VALUE         32895
+#define _APS_NEXT_COMMAND_VALUE         32898
 #define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif