派工单增加订单号、姓名、电话、地址

bin/Win32/Release/setup/乐外卖接单软件安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.0.3.6"
+!define PRODUCT_VERSION "1.0.3.7"
 !define PRODUCT_PUBLISHER "深圳市迅享科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1223,6 +1223,34 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
 				POS_FeedLine();
 			}
 
+			//打印订单号
+			string order_num = "订 单 号：" + CLewaimaiString::UTF8ToANSI(order.m_order_num);
+			POS_TextOut(order_num, false, false);
+			POS_FeedLine();
+
+			//打印顾客信息
+			//姓名
+			if (order.m_is_selftake != "1")
+			{
+				string name = "姓名：" + CLewaimaiString::UTF8ToANSI(order.m_customer_name);
+
+				POS_TextOut(name, false, false);
+				POS_FeedLine();
+			}
+
+			//电话
+			string phone = "电话：" + CLewaimaiString::UTF8ToANSI(order.m_phone);
+			POS_TextOut(phone, false, false);
+			POS_FeedLine();
+
+			//地址
+			if (order.m_is_selftake != "1")
+			{
+				string address = "地址：" + CLewaimaiString::UTF8ToANSI(order.m_address);
+				POS_TextOut(address, false, false);
+				POS_FeedLine();
+			}
+
             //预设选项
             if(order.m_order_field.size() > 1)
             {
@@ -1362,6 +1390,44 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
                     POS_FeedLine();
                 }
 
+				if (order.m_is_book == "1")
+				{
+					//预约单
+					string date = "【预约单】" + CLewaimaiString::UTF8ToANSI(order.m_delivery_date);
+					POS_TextOut(date, false, true);
+					POS_TextOut("送达", false, false);
+
+					POS_FeedLine();
+				}
+
+				//打印订单号
+				string order_num = "订 单 号：" + CLewaimaiString::UTF8ToANSI(order.m_order_num);
+				POS_TextOut(order_num, false, false);
+				POS_FeedLine();
+
+				//打印顾客信息
+				//姓名
+				if (order.m_is_selftake != "1")
+				{
+					string name = "姓名：" + CLewaimaiString::UTF8ToANSI(order.m_customer_name);
+
+					POS_TextOut(name, false, false);
+					POS_FeedLine();
+				}
+
+				//电话
+				string phone = "电话：" + CLewaimaiString::UTF8ToANSI(order.m_phone);
+				POS_TextOut(phone, false, false);
+				POS_FeedLine();
+
+				//地址
+				if (order.m_is_selftake != "1")
+				{
+					string address = "地址：" + CLewaimaiString::UTF8ToANSI(order.m_address);
+					POS_TextOut(address, false, false);
+					POS_FeedLine();
+				}
+
                 //预设选项
                 if(order.m_order_field.size() > 1)
                 {