feat<central>下单，快捷码支持3或4位，并修改了下单部分逻辑错误

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

feat<central>下单，快捷码支持3或4位，并修改了下单部分逻辑错误
Signed-off-by: liuye <liuye@diligrp.com>
liuye
1 parent 8abd82cd
Showing 3 changed files with 16 additions and 15 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/mfc_ui/etrade_edit_control.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
@@ -286,8 +286,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,13
- PRODUCTVERSION 2,0,0,13
+ FILEVERSION 2,0,0,14
+ PRODUCTVERSION 2,0,0,14
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -304,12 +304,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.13"
-            VALUE "InternalName", "Central-Clearing-System_2.0.13.181121_Beta"
+            VALUE "FileVersion", "2.0.0.14"
+            VALUE "InternalName", "Central-Clearing-System_2.0.14.181121_Beta"
             VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
-            VALUE "OriginalFilename", "Central-Clearing-System_2.0.13.181121_Beta"
-            VALUE "ProductName", "Central-Clearing-System_2.0.13.181121_Beta"
-            VALUE "ProductVersion", "2.0.0.13"
+            VALUE "OriginalFilename", "Central-Clearing-System_2.0.14.181121_Beta"
+            VALUE "ProductName", "Central-Clearing-System_2.0.14.181121_Beta"
+            VALUE "ProductVersion", "2.0.0.14"
         END
     END
     BLOCK "VarFileInfo"
@@ -132,12 +132,6 @@ bool CEditBox::CheckCardNum(CString num)
 	do 
 	{
-		/*if (num.GetLength() > 12)
-		{
-		result = false;
-		break;
-		}*/
-
 		if (num.SpanIncluding(L"0123456789") != num)
 		{
 			result = false;
@@ -154,7 +148,7 @@ bool CEditBox::CheckCommNum(CString num)
 	do 
 	{
-		if (num.GetLength() > 3)
+		if (num.GetLength() > 4)
 		{
 			result = false;
 			break;
@@ -756,6 +756,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		if (text.IsEmpty())
 		{
 			card_edit_.SetEditRed(true);
+			name_edit_.SetWindowText(L"");
 			break;
 		}
@@ -768,6 +769,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		else
 		{
 			SetErrorMsg(name);
+			name_edit_.SetWindowText(L"");
 			card_edit_.SetEditRed(true);
 		}
@@ -779,6 +781,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		if (text.GetLength() < 3)
 		{
 			comm_num_edit_.SetEditRed(true);
+			comm_name_edit_.SetWindowText(L"");
 			break;
 		}
 		CString seller_card;
@@ -791,7 +794,7 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		}
 		else
 		{
-			//SetErrorMsg(name);
+			comm_name_edit_.SetWindowText(L"");
 			comm_num_edit_.SetEditRed(true);
 		}
@@ -1329,6 +1332,10 @@ void PlaceOrderDlg::OnBnClickedButtonSwipCard()
 			buyer_card_edit_.SetWindowText(L"");
 			buyer_name_edit_.SetWindowText(L"");
+
+			EnableCtrl(false);
+			comm_vec_.clear();
+
 			break;
 		}