Commit dc237d9d85293a9344a298bf3e7c920b6dba2c12

Authored by liuye
1 parent f24b2936

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

Signed-off-by: liuye <liuye@diligrp.com>
central_clearing_system/ETradeClient.rc
@@ -286,8 +286,8 @@ END @@ -286,8 +286,8 @@ END
286 // 286 //
287 287
288 VS_VERSION_INFO VERSIONINFO 288 VS_VERSION_INFO VERSIONINFO
289 - FILEVERSION 2,0,0,14  
290 - PRODUCTVERSION 2,0,0,14 289 + FILEVERSION 2,0,0,15
  290 + PRODUCTVERSION 2,0,0,15
291 FILEFLAGSMASK 0x3fL 291 FILEFLAGSMASK 0x3fL
292 #ifdef _DEBUG 292 #ifdef _DEBUG
293 FILEFLAGS 0x1L 293 FILEFLAGS 0x1L
@@ -304,12 +304,12 @@ BEGIN @@ -304,12 +304,12 @@ BEGIN
304 BEGIN 304 BEGIN
305 VALUE "CompanyName", "地利集团【DILI GROUP】" 305 VALUE "CompanyName", "地利集团【DILI GROUP】"
306 VALUE "FileDescription", "电子交易结算综合业务系统" 306 VALUE "FileDescription", "电子交易结算综合业务系统"
307 - VALUE "FileVersion", "2.0.0.14"  
308 - VALUE "InternalName", "Central-Clearing-System_2.0.14.181121_Relaese" 307 + VALUE "FileVersion", "2.0.0.15"
  308 + VALUE "InternalName", "Central-Clearing-System_2.0.15.181123_Beta"
309 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。" 309 VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
310 - VALUE "OriginalFilename", "Central-Clearing-System_2.0.14.181121_Relaese"  
311 - VALUE "ProductName", "Central-Clearing-System_2.0.14.181121_Relaese"  
312 - VALUE "ProductVersion", "2.0.0.14" 310 + VALUE "OriginalFilename", "Central-Clearing-System_2.0.15.181123_Beta"
  311 + VALUE "ProductName", "Central-Clearing-System_2.0.15.181123_Beta"
  312 + VALUE "ProductVersion", "2.0.0.15"
313 END 313 END
314 END 314 END
315 BLOCK "VarFileInfo" 315 BLOCK "VarFileInfo"
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
@@ -677,7 +677,7 @@ void PlaceOrderDlg::OnAcceleratorEnter() @@ -677,7 +677,7 @@ void PlaceOrderDlg::OnAcceleratorEnter()
677 } 677 }
678 } 678 }
679 679
680 - EmptyCtrl(false); 680 + EmptyCtrl(false, false);
681 SortList(); 681 SortList();
682 682
683 CString subtotal; 683 CString subtotal;
@@ -1268,10 +1268,8 @@ void PlaceOrderDlg::SortList() @@ -1268,10 +1268,8 @@ void PlaceOrderDlg::SortList()
1268 product_list_.Invalidate(TRUE); 1268 product_list_.Invalidate(TRUE);
1269 } 1269 }
1270 1270
1271 -void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer) 1271 +void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer, bool is_empty_saler)
1272 { 1272 {
1273 - card_edit_.SetWindowText(L"8888");  
1274 - name_edit_.SetWindowText(L"");  
1275 comm_num_edit_.SetWindowText(L""); 1273 comm_num_edit_.SetWindowText(L"");
1276 comm_name_edit_.SetWindowText(L""); 1274 comm_name_edit_.SetWindowText(L"");
1277 unit_edit_.SetWindowText(L"1");; 1275 unit_edit_.SetWindowText(L"1");;
@@ -1287,9 +1285,14 @@ void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer) @@ -1287,9 +1285,14 @@ void PlaceOrderDlg::EmptyCtrl(bool is_empty_buyer)
1287 buyer_name_edit_.SetWindowTextW(L""); 1285 buyer_name_edit_.SetWindowTextW(L"");
1288 total_real_money_static_.SetWindowTextW(L"0.00"); 1286 total_real_money_static_.SetWindowTextW(L"0.00");
1289 } 1287 }
1290 -  
1291 1288
1292 - card_edit_.SetSel(4, 4); 1289 + if (is_empty_saler)
  1290 + {
  1291 + card_edit_.SetWindowText(L"8888");
  1292 + name_edit_.SetWindowText(L"");
  1293 + }
  1294 +
  1295 + card_edit_.SetSel(0, -1);
1293 } 1296 }
1294 1297
1295 void PlaceOrderDlg::OnBnClickedButtonSwipCard() 1298 void PlaceOrderDlg::OnBnClickedButtonSwipCard()
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
@@ -74,7 +74,7 @@ private: @@ -74,7 +74,7 @@ private:
74 void SetCtrlInitData(); 74 void SetCtrlInitData();
75 void InitList(); 75 void InitList();
76 void SortList(); 76 void SortList();
77 - void EmptyCtrl(bool is_empty_buyer); 77 + void EmptyCtrl(bool is_empty_buyer, bool is_empty_saler = true);
78 void EnableCtrl(bool is_enable); 78 void EnableCtrl(bool is_enable);
79 79
80 int GetCommIndex(); 80 int GetCommIndex();
doc/各市场版本/20181122/综合业务系统-2.0.14.181122.zip 0 → 100644
No preview for this file type