标签打印增加预设选项打印

bin/Win32/Release/setup/智铺子收银系统安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "智铺子收银系统"
-!define PRODUCT_VERSION "1.0.0.9"
+!define PRODUCT_VERSION "1.0.1.0"
 !define PRODUCT_PUBLISHER "深圳市迅享智慧云科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.zhipuzi.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -702,25 +702,40 @@ std::string CPosPrinterData::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 				textData += BIAOQIAN_TEXTGet(pay_type, 12, nHeightNow + 30, 1, 1);
 
 				std::string name = "姓名：" + CLewaimaiString::UTF8ToANSI(order.m_customer_name);
-				textData += BIAOQIAN_TEXTGet(name, 12, nHeightNow + 90, 2, 2);
+				textData += BIAOQIAN_TEXTGet(name, 12, nHeightNow + 60, 1, 1);
 
 				std::string phone = "电话：" + CLewaimaiString::UTF8ToANSI(order.m_phone);
-				textData += BIAOQIAN_TEXTGet(phone, 12, nHeightNow + 150, 2, 2);
+				textData += BIAOQIAN_TEXTGet(phone, 12, nHeightNow + 90, 1, 1);
+
+				int nHeightAddress = nHeightNow + 120;
 
 				//地址有可能很长要换行，要处理一下
 				std::string address = "地址：" + CLewaimaiString::UTF8ToANSI(order.m_address);
 
 				//每行最多显示12个汉字，这里要计算一下换行（要先转成ANSI格式）
 				std::string handle_address_name = address;
-				std::vector<std::string> addressVector = HandleBiaoqianFoodname(handle_address_name, biaoqian_width, true);
+				std::vector<std::string> addressVector = HandleBiaoqianFoodname(handle_address_name, biaoqian_width, false);
 
 				int nRow = 0;
-
 				for (std::vector<std::string>::iterator it = addressVector.begin(); it != addressVector.end(); it++)
 				{
-					textData += BIAOQIAN_TEXTGet(*it, 12, nHeightNow + 210 + 60 * nRow, 2, 2);
+					textData += BIAOQIAN_TEXTGet(*it, 12, nHeightNow + 120 + 30 * nRow, 1, 1);
 
 					nRow++;
+
+					nHeightAddress += 30;
+				}
+
+				//预设选项
+				if (order.m_order_field.size() > 1)
+				{
+					for (std::vector<CWaimaiOrderField>::iterator it = order.m_order_field.begin(); it != order.m_order_field.end() - 1; it++)
+					{
+						string order_field = CLewaimaiString::UTF8ToANSI((*it).name) + "：" + CLewaimaiString::UTF8ToANSI((*it).value);
+						textData += BIAOQIAN_TEXTGet(order_field, 12, nHeightAddress, 1, 1);
+
+						nHeightAddress += 30;
+					}
 				}
 			}