|
|
@@ -488,6 +488,8 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
|
|
|
LOG_INFO("网口打印机连接失败,IP地址:" << wangkou_ip.c_str() << ",错误信息:" << err.c_str());
|
|
|
|
|
|
MessageBoxW(NULL, (L"厨房网口打印机连接失败,IP地址:" + CLewaimaiString::UTF8ToUnicode(wangkou_ip)).c_str(), L"打印机连接失败", MB_OK);
|
|
|
+
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1118,12 +1120,16 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
|
|
|
|
|
|
void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
{
|
|
|
+ LOG_INFO("_______________________________开始打印厨房小票,订单编号:" << order.m_order_num.c_str() << "_________________________");
|
|
|
+
|
|
|
//设置模式,后面输出数据不会错
|
|
|
m_type = 2;
|
|
|
|
|
|
//读取厨房打印机信息
|
|
|
std::vector<ChufangPrinter> total_printers = CSetting::getChufangPrints();
|
|
|
|
|
|
+ LOG_INFO("厨房打印机总数量:" << total_printers.size());
|
|
|
+
|
|
|
for(std::vector<ChufangPrinter>::iterator it = total_printers.begin(); it != total_printers.end(); it++)
|
|
|
{
|
|
|
ChufangPrinter printer = *it;
|
|
|
@@ -1146,6 +1152,8 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
+ LOG_INFO("厨房网口打印机连接成功,IP地址:" << ip.c_str());
|
|
|
+
|
|
|
std::string guige = printer.guige;
|
|
|
std::string fendan = printer.fendan;
|
|
|
std::string fenlei = printer.fenlei;
|
|
|
@@ -1154,10 +1162,12 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
std::vector<CWaimaiOrderItem> cur_printer_use;
|
|
|
if (fenlei == "0")
|
|
|
{
|
|
|
+ LOG_INFO("未开启分类打印");
|
|
|
cur_printer_use = order.m_order_items;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ LOG_INFO("已开启分类打印");
|
|
|
//如果开启了分类打印,就要比对了
|
|
|
std::map<string, bool> ids_map;
|
|
|
std::vector<string> ids = CLewaimaiString::Split(fenlei_ids, ",");
|
|
|
@@ -1177,6 +1187,8 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ LOG_INFO("当前厨房打印机可以打印的商品数量:" << cur_printer_use.size());
|
|
|
+
|
|
|
if (cur_printer_use.size() == 0)
|
|
|
{
|
|
|
//如果这个厨房打印机没有商品可以打印(开启了商品分类打印可能出现),就直接跳过
|
|
|
@@ -1196,7 +1208,7 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
|
|
|
POS_FeedLine();
|
|
|
|
|
|
- string order_type = "#" + order.m_restaurant_number + " ";
|
|
|
+ string order_type = "#" + order.m_restaurant_number + " ";
|
|
|
|
|
|
if(order.m_is_selftake == "1")
|
|
|
{
|
|
|
@@ -1224,7 +1236,7 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
}
|
|
|
|
|
|
//打印订单号
|
|
|
- string order_num = "订 单 号:" + CLewaimaiString::UTF8ToANSI(order.m_order_num);
|
|
|
+ string order_num = "订单号:" + CLewaimaiString::UTF8ToANSI(order.m_order_num);
|
|
|
POS_TextOut(order_num, false, false);
|
|
|
POS_FeedLine();
|
|
|
|
|
|
@@ -1526,6 +1538,8 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
|
|
|
|
|
|
m_socket.close();
|
|
|
}
|
|
|
+
|
|
|
+ LOG_INFO("_______________________________结束打印厨房小票,订单编号:" << order.m_order_num.c_str() << "_________________________");
|
|
|
}
|
|
|
|
|
|
std::vector<std::wstring> CPosPrinter::getUsbDevices()
|