bugfix<central_clearing_system>:下单时，点击回车不清空卖家信息

Signed-off-by: liuye <liuye@diligrp.com>

bugfix<central_clearing_system>:下单时，点击回车不清空卖家信息
Signed-off-by: liuye <liuye@diligrp.com>
liuye
1 parent f24b2936
Showing 4 changed files with 17 additions and 14 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
doc/各市场版本/20181122/综合业务系统-2.0.14.181122.zip
@@ -286,8 +286,8 @@ END
 //
  
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,14
- PRODUCTVERSION 2,0,0,14
+ FILEVERSION 2,0,0,15
+ PRODUCTVERSION 2,0,0,15
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -304,12 +304,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.14"
-            VALUE "InternalName", "Central-Clearing-System_2.0.14.181121_Relaese"
+            VALUE "FileVersion", "2.0.0.15"
+            VALUE "InternalName", "Central-Clearing-System_2.0.15.181123_Beta"
             VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
-            VALUE "OriginalFilename", "Central-Clearing-System_2.0.14.181121_Relaese"
-            VALUE "ProductName", "Central-Clearing-System_2.0.14.181121_Relaese"
-            VALUE "ProductVersion", "2.0.0.14"
+            VALUE "OriginalFilename", "Central-Clearing-System_2.0.15.181123_Beta"
+            VALUE "ProductName", "Central-Clearing-System_2.0.15.181123_Beta"
+            VALUE "ProductVersion", "2.0.0.15"
         END
     END
     BLOCK "VarFileInfo"
@@ -677,7 +677,7 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 				}
 			}
  
-			EmptyCtrl(false);
+			EmptyCtrl(false, false);
 			SortList();
  
 			CString subtotal;
@@ -1268,10 +1268,8 @@ void PlaceOrderDlg::SortList()
 	product_list_.Invalidate(TRUE);
 }
  
-void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer)
+void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer, bool is_empty_saler)
 {
-	card_edit_.SetWindowText(L"8888");
-	name_edit_.SetWindowText(L"");
 	comm_num_edit_.SetWindowText(L"");
 	comm_name_edit_.SetWindowText(L"");
 	unit_edit_.SetWindowText(L"1");;
@@ -1287,9 +1285,14 @@ void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer)
 		buyer_name_edit_.SetWindowTextW(L"");
 		total_real_money_static_.SetWindowTextW(L"0.00");
 	}
-	
  
-	card_edit_.SetSel(4, 4);
+	if (is_empty_saler)
+	{
+		card_edit_.SetWindowText(L"8888");
+		name_edit_.SetWindowText(L"");
+	}
+	
+	card_edit_.SetSel(0, -1);
 }
  
 void PlaceOrderDlg::OnBnClickedButtonSwipCard()
@@ -74,7 +74,7 @@ private:
 	void SetCtrlInitData();
 	void InitList();
 	void SortList();
-	void EmptyCtrl(bool is_empty_buyer);
+	void EmptyCtrl(bool is_empty_buyer, bool is_empty_saler = true);
 	void EnableCtrl(bool is_enable);
  
 	int GetCommIndex();