Przeglądaj źródła

订单小票打印抢单二维码

张洋 6 lat temu
rodzic
commit
58b268ad88

BIN
bin/Win32/Release/lewaimai_pos_windows/db/pos.db


+ 5 - 0
bin/Win32/Release/lewaimai_pos_windows/log/pos.log

@@ -0,0 +1,5 @@
+2019-09-01 14:56:14[INFO] - folderPath:E:\work\code\lewaimai_pos_windows\bin\Win32\Release\lewaimai_pos_windows\db,没有找到对应的目录,即将创建 [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:11]
+2019-09-01 14:56:14[INFO] - 新建 db 目录成功! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:18]
+2019-09-01 14:56:32[INFO] - login failed! message:密码错误,自动退出,请重新登录 [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows\network\clewaimaihttpclient.cpp:57]
+2019-09-01 14:56:37[INFO] - 可用的USB打印机数量:0 [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows\tool\cposprinter.cpp:29]
+2019-09-01 14:56:53[INFO] - parse response error! [e:\work\code\lewaimai_pos_windows\lewaimai_pos_windows\control\orderlistui.cpp:99]

+ 0 - 0
bin/Win32/Release/lewaimai_pos_windows/log/pos_error.log


+ 12 - 3
lewaimai_pos_windows/network/CMessagePush.cpp

@@ -449,7 +449,7 @@ void CMessagePush::HandlePrinter()
         CWaimaiOrder order;
 		if (print_type == 1)
 		{
-			if (CSetting::GetParam("setting_is_new_waimai_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
+			if (CSetting::GetParam("setting_is_new_waimai_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_biaoqian_printer") == "1" || CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
 			{
 				bool ret = order.InitData(order_id, order_no);
 
@@ -488,11 +488,20 @@ void CMessagePush::HandlePrinter()
 				continue;
 			}
 
+			//手动打印的模式下,收银小票一定打印,标签和厨房如果没开就不打印
 			AddShouyinPrinter(order);
 
-			AddBiaoqianPrinter(order);
+			//判断是否自动打印标签小票
+			if (CSetting::GetParam("setting_is_new_waimai_biaoqian_printer") == "1")
+			{
+				AddBiaoqianPrinter(order);
+			}
 
-			AddChufangPrinter(order);
+			//判断是否进行自动的厨房打印
+			if (CSetting::GetParam("setting_is_new_waimai_chufang_printer") == "1")
+			{
+				AddChufangPrinter(order);
+			}
 		}
     }
 

+ 2 - 0
lewaimai_pos_windows/order/CWaimaiOrder.cpp

@@ -153,6 +153,8 @@ bool CWaimaiOrder::InitData(std::string order_id, std::string order_no)
 
 				m_addservie.push_back(newItem);
 			}
+
+			m_show_qiangdan_qrcode = data["show_qiangdan_qrcode"].GetString();
 		}
 	}
 

+ 2 - 0
lewaimai_pos_windows/order/CWaimaiOrder.h

@@ -100,5 +100,7 @@ public:
 	std::vector<CWaimaiOrderItem> m_order_items;
 	std::vector<CWaimaiOrderField> m_order_field;
 	std::vector<CWaimaiOrderField> m_addservie;
+
+	std::string m_show_qiangdan_qrcode;
 };
 

+ 8 - 2
lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -836,9 +836,15 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
         std::string order_no = order.m_order_no;
         order_no = CLewaimaiString::UTF8ToANSI(order_no);
 
-		//POS_OutQRCode(order_no);
+		if (order.m_show_qiangdan_qrcode == "1")
+		{
+			POS_OutQRCode(order_no);
+		}
+
+		POS_FeedLine();
+		POS_FeedLine();
 
-		//POS_OutBmp(L"D:\\200.jpg");
+		POS_OutBmp(L"D:\\132.jpg");
 
         //走纸几行再切
         POS_FeedLine();