1

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "CPosPrinterData.h"
 
 #include "../helper/CBitmapHelper.h"
@@ -2768,11 +2768,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderXiadanChuf
 
 				if (guige == "58")
 				{
-		lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
+					lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
 				}
 				else
 				{
-		lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
+					lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
 				}
 
 				POS_TextOut(lines);
@@ -2781,11 +2781,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderXiadanChuf
 				//商品标题
 				if (guige == "58")
 				{
-				POS_TextOut(CLewaimaiString::UnicodeToGBK(L"商品           单价   数量  金额"), false, true);
+					POS_TextOut(CLewaimaiString::UnicodeToGBK(L"商品           单价   数量  金额"), false, true);
 				}
 				else
 				{
-				POS_TextOut(CLewaimaiString::UnicodeToGBK(L"商品                         单价    数量   金额"), false, true);
+					POS_TextOut(CLewaimaiString::UnicodeToGBK(L"商品                         单价    数量   金额"), false, true);
 				}
 
 				POS_FeedLine();
@@ -2948,11 +2948,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 
 			if (guige == "58")
 			{
-				lines = "--------------------------------";
+				lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
 			}
 			else
 			{
-				lines = "------------------------------------------------";
+				lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
 			}
 
 			POS_TextOut(lines);
@@ -2986,7 +2986,7 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 				//计算总价
 				double item_price = atof(food_price.c_str()) * atof(quantity.c_str());
 				std::string food_total_price = CLewaimaiString::DoubleToString(item_price, 2);
-				food_name = "【退菜】" + CLewaimaiString::UTF8ToGBK(food_name);
+				food_name = CLewaimaiString::UnicodeToGBK(L"【退菜】") + CLewaimaiString::UTF8ToGBK(food_name);
 
 				//先输出商品名字
 				std::vector<std::string> m_names;
@@ -3030,8 +3030,8 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 			if (order.m_memo.length() > 0)
 			{
 				POS_FeedLine();
-			std::string address = CLewaimaiString::UnicodeToGBK(L"整单备注：") + CLewaimaiString::UTF8ToGBK(order.m_memo);
-			POS_TextOut(address, false, true, 0);
+				std::string address = CLewaimaiString::UnicodeToGBK(L"整单备注：") + CLewaimaiString::UTF8ToGBK(order.m_memo);
+				POS_TextOut(address, false, true, 0);
 				POS_FeedLine();
 			}
 
@@ -3063,7 +3063,7 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 					continue;
 				}
 
-			POS_TextOut(CLewaimaiString::UnicodeToGBK(L"退菜单"), true, true, 1);
+				POS_TextOut(CLewaimaiString::UnicodeToGBK(L"退菜单"), true, true, 1);
 				POS_FeedLine();
 
 				POS_FeedLine();
@@ -3093,11 +3093,11 @@ std::vector<ChufangPrinterContent> CPosPrinterData::PrintZhengcanOrderTuicaiChuf
 
 				if (guige == "58")
 				{
-					lines = "--------------------------------";
+					lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
 				}
 				else
 				{
-					lines = "------------------------------------------------";
+					lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
 				}
 
 				POS_TextOut(lines);
@@ -4204,11 +4204,11 @@ std::string CPosPrinterData::PrintJiaobanOrder(CJiaobaoOrder& order)
 
 	if (guige == "58")
 	{
-		lines = "--------------------------------";
+		lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
 	}
 	else
 	{
-		lines = "------------------------------------------------";
+		lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
 	}
 
 	POS_TextOut(lines);
@@ -4332,11 +4332,11 @@ std::string CPosPrinterData::PrintHuiyuanchongzhiOrder(CHuiyuanchongzhiOrder& or
 
 	if (guige == "58")
 	{
-		lines = "--------------------------------";
+		lines = CLewaimaiString::UnicodeToGBK(L"--------------------------------");
 	}
 	else
 	{
-		lines = "------------------------------------------------";
+		lines = CLewaimaiString::UnicodeToGBK(L"------------------------------------------------");
 	}
 
 	POS_TextOut(lines);