bugfix<central>解决打印时数据解析异常的问题

1.69boost解析中文时有问题，在最后打印时再解析成宽字符 Signed-off-by: liuye <liuye@diligrp.com>

bugfix<central>解决打印时数据解析异常的问题
1.69boost解析中文时有问题，在最后打印时再解析成宽字符 Signed-off-by: liuye <liuye@diligrp.com>
liuye
1 parent 229f3ca3
Showing 7 changed files with 36 additions and 39 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.h
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
dlcm/.vs/dlcm/v15/Browse.VC.db
dlcm/dlcm/dlcm.vcxproj
@@ -288,8 +288,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,4,0
- PRODUCTVERSION 4,0,4,0
+ FILEVERSION 4,0,5,0
+ PRODUCTVERSION 4,0,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -306,12 +306,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "4.0.4.0"
+            VALUE "FileVersion", "4.0.5.0"
             VALUE "InternalName", "电子交易结算综合业务系统"
             VALUE "LegalCopyright", "(C) 地利集团保留所有权利。"
             VALUE "OriginalFilename", "电子交易结算综合业务系统"
             VALUE "ProductName", "电子交易结算综合业务系统"
-            VALUE "ProductVersion", "4.0.4.0"
+            VALUE "ProductVersion", "4.0.5.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -78,8 +78,7 @@ namespace HW
 			PT::ptree data_child = ptree.get_child(JSON_TAG_DATA);
 			std::ostringstream os;
 			PT::write_json(os, data_child);
-			CString data_t = str_2_wstr(std::string(os.str())).c_str();
-			data = CT2A(data_t);
+			data = std::string(os.str());
 		}
 		else
 		{
@@ -1373,8 +1373,7 @@ std::string StylusPrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 		y_point += TitleCtrlVI;
 		dc->MoveTo(LineStartX, y_point);
-		x_point += LineLength;
-		dc->LineTo(x_point, y_point);
+		dc->LineTo(LineLength + LineStartX, y_point);
 		//
 		//打印商品信息头
@@ -1535,23 +1534,23 @@ std::string StylusPrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;OrderIn
 		BOOST_FOREACH(PT::ptree::value_type &v, order_tree)
 		{
 			OrderInfo order;
-			order.doc_name = title.c_str();
-			order.statements_no = v.second.get<std::string>(JSON_TAG_STATEMENT_ID).c_str();
-			order.trade_time = v.second.get<std::string>(JSON_TAG_TRADE_TIME).c_str();
-			order.buyer_name = v.second.get<std::string>(JSON_TAG_TRADE_BUYER_NAME).c_str();
-			order.seller_name = v.second.get<std::string>(JSON_TAG_TRADE_SELLER_NAME).c_str();
-			order.settlement_clerk = v.second.get<std::string>(JSON_TAG_TRADE_USER_NAME).c_str();
-			order.total_money = v.second.get<std::string>(JSON_TAG_TRADE_TOTAL_MONEY).c_str();
+			order.doc_name = str_2_wstr(title).c_str();
+			order.statements_no = str_2_wstr(v.second.get<std::string>(JSON_TAG_STATEMENT_ID)).c_str();
+			order.trade_time = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_TIME)).c_str();
+			order.buyer_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_BUYER_NAME)).c_str();
+			order.seller_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_SELLER_NAME)).c_str();
+			order.settlement_clerk = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_USER_NAME)).c_str();
+			order.total_money = str_2_wstr(v.second.get<std::string>(JSON_TAG_TRADE_TOTAL_MONEY)).c_str();
 			PT::ptree products_ptree = v.second.get_child(JSON_TAG_TRADE_PRODUCTS);
 			BOOST_FOREACH(PT::ptree::value_type &v, products_ptree)
 			{
 				CommInfo comm_info;
 				comm_info.comm_id = v.second.get<long>(JSON_TAG_ORDER_ID);
-				comm_info.comm_name = v.second.get<std::string>(JSON_TAG_PRODUCT_NAME).c_str();
-				comm_info.price = v.second.get<std::string>(JSON_TAG_PRICE).c_str();
-				comm_info.count = v.second.get<std::string>(JSON_TAG_AMOUNT).c_str();
-				comm_info.total_money = v.second.get<std::string>(JSON_TAG_MONEY).c_str();
+				comm_info.comm_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_PRODUCT_NAME)).c_str();
+				comm_info.price = str_2_wstr(v.second.get<std::string>(JSON_TAG_PRICE)).c_str();
+				comm_info.count = str_2_wstr(v.second.get<std::string>(JSON_TAG_AMOUNT)).c_str();
+				comm_info.total_money = str_2_wstr(v.second.get<std::string>(JSON_TAG_MONEY)).c_str();
 				order.comm_vector.push_back(comm_info);
 			}
 			order_vector.push_back(order);
@@ -1566,7 +1565,7 @@ std::string StylusPrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;OrderIn
 }
-std::string DistributePrinterCmd::ParseInput(std::string &input, std::vector<OrderInfo> &order_vector)
+std::string DistributePrinterCmd::ParseInput(const std::string &input, std::vector<OrderInfo> &order_vector)
 {
 	std::string result = StatusCode::OK;
@@ -1598,22 +1597,22 @@ std::string DistributePrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;Ord
 		BOOST_FOREACH(PT::ptree::value_type &v, order_tree)
 		{
 			OrderInfo order;
-			order.title = title.c_str();
-			order.reg_id = v.second.get<std::string>(JSON_TAG_REG_ID).c_str();
-			order.sheet_id = v.second.get<std::string>(JSON_TAG_SHEET_ID).c_str();
-			order.entry_fee= v.second.get<std::string>(JSON_TAG_ENTRY_FEE).c_str();
-			order.seller_name = v.second.get<std::string>(JSON_TAG_SELLER_NAME).c_str();
-			order.dis_name = v.second.get<std::string>(JSON_TAG_DIS_NAME).c_str();
-			order.dis_date = v.second.get<std::string>(JSON_TAG_DIS_DATE).c_str();
+			order.title = str_2_wstr(title).c_str();
+			order.reg_id = str_2_wstr(v.second.get<std::string>(JSON_TAG_REG_ID)).c_str();
+			order.sheet_id = str_2_wstr(v.second.get<std::string>(JSON_TAG_SHEET_ID)).c_str();
+			order.entry_fee= str_2_wstr(v.second.get<std::string>(JSON_TAG_ENTRY_FEE)).c_str();
+			order.seller_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_SELLER_NAME)).c_str();
+			order.dis_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_DIS_NAME)).c_str();
+			order.dis_date = str_2_wstr(v.second.get<std::string>(JSON_TAG_DIS_DATE)).c_str();
 			PT::ptree products_ptree = v.second.get_child(JSON_TAG_PRODUCTS);
 			BOOST_FOREACH(PT::ptree::value_type &v, products_ptree)
 			{
 				CommInfo comm_info;
-				comm_info.product_name = v.second.get<std::string>(JSON_TAG_PRODUCT_NAME).c_str();
-				comm_info.amount = v.second.get<std::string>(JSON_TAG_AMOUNT).c_str();
-				comm_info.place = v.second.get<std::string>(JSON_TAG_PLACE).c_str();
-				comm_info.brand = v.second.get<std::string>(JSON_TAG_BRAND).c_str();
+				comm_info.product_name = str_2_wstr(v.second.get<std::string>(JSON_TAG_PRODUCT_NAME)).c_str();
+				comm_info.amount = str_2_wstr(v.second.get<std::string>(JSON_TAG_AMOUNT)).c_str();
+				comm_info.place = str_2_wstr(v.second.get<std::string>(JSON_TAG_PLACE)).c_str();
+				comm_info.brand = str_2_wstr(v.second.get<std::string>(JSON_TAG_BRAND)).c_str();
 				order.comm_vector.push_back(comm_info);
 			}
 			order_vector.push_back(order);
@@ -1745,8 +1744,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 		y_point += TitleCtrlVI;
 		dc->MoveTo(LineStartX, y_point);
-		x_point += LineLength;
-		dc->LineTo(x_point, y_point);
+		dc->LineTo(LineStartX + LineLength, y_point);
 		//
 		//打印商品信息头
@@ -154,7 +154,7 @@ public:
 	virtual Reply Execute(const std::string& input) override;
 private:
-	std::string ParseInput(std::string &input, std::vector<OrderInfo> &order_vector);
+	std::string ParseInput(const std::string &input, std::vector<OrderInfo> &order_vector);
 	std::string Print(std::vector<OrderInfo> &order_vector);
 };
 //
@@ -252,8 +252,7 @@ void PayDlg::OnBnClickedPayButtonPay()
 				PT::ptree data_child = ptree.get_child("data");
 				std::ostringstream os;
 				PT::write_json(os, data_child);
-				CString data = str_2_wstr(std::string(os.str())).c_str();
-				statement_data = CT2A(data);
+				statement_data = std::string(os.str());
 			}
 			else
 			{
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,19 +14,20 @@
     <ProjectGuid>{8256469C-3B17-4009-93A8-448F7A56DDEC}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>dlcm</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>Static</UseOfMfc>