Просмотр исходного кода

Merge branch 'master' of https://gitserver.xunjoy.com/zhangyang/lewaimai_pos_windows

zhangyang 5 лет назад
Родитель
Сommit
12cc76f2f9

BIN
bin/Win32/Release/setup/lewaimai_pos_windows_setup_1.0.3.0.exe


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

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

BIN
lewaimai_pos_windows/resource/lewaimai_pos_windows.aps


BIN
lewaimai_pos_windows/resource/lewaimai_pos_windows.rc


+ 4 - 0
lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -486,6 +486,8 @@ void CPosPrinter::PrintWaimaiOrderShouyin(CWaimaiOrder& order)
         {
             std::string err = e.what();
             LOG_INFO("网口打印机连接失败,IP地址:" << wangkou_ip.c_str() << ",错误信息:" << err.c_str());
+
+			MessageBoxW(NULL, (L"厨房网口打印机连接失败,IP地址:" + CLewaimaiString::UTF8ToUnicode(wangkou_ip)).c_str(), L"打印机连接失败", MB_OK);
         }
     }
 
@@ -1068,6 +1070,8 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
             std::string err = e.what();
             LOG_INFO("厨房网口打印机连接失败,IP地址:" << ip.c_str() << ",错误信息:" << err.c_str());
 
+			MessageBoxW(NULL, (L"厨房网口打印机连接失败,IP地址:" + CLewaimaiString::UTF8ToUnicode(ip)).c_str(), L"打印机连接失败", MB_OK);
+
             //连接失败了,处理下一个厨房打印机
             continue;
         }