Explorar el Código

更新到1.0.3.6
(1)修复连锁店模式下厨房打印机退出重新登录后的bug
(2)派工单增加预约提示

张洋 hace 4 años
padre
commit
83b2f4ff77

BIN
bin/Win32/Release/setup/lewaimai_pos_windows_setup_1.0.3.5.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.5"
+!define PRODUCT_VERSION "1.0.3.6"
 !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
dump/1.0.3.6/lewaimai_pos_windows.exe


BIN
dump/1.0.3.6/lewaimai_pos_windows.iobj


BIN
dump/1.0.3.6/lewaimai_pos_windows.ipdb


BIN
dump/1.0.3.6/lewaimai_pos_windows.pdb


+ 5 - 6
lewaimai_pos_windows/network/CLewaimaiHttpClient.cpp

@@ -83,6 +83,7 @@ bool CLewaimaiHttpClient::Login(std::string& errmsg)
 
 		//店铺ID默认为0
 		m_client.m_shop_id = "0";
+		m_client.m_shop_ids = "";
 
 		rapidjson::Value& v_rows = data["shop_ids"];
 
@@ -165,14 +166,14 @@ bool CLewaimaiHttpClient::Request(std::string url, std::map<string, string> para
 	CHttpClient m_httpClient;
 	int ret = m_httpClient.Posts(m_client.m_url + url, postString, response, NULL);
 
-	LOG_INFO("response:" << response.c_str());
-
-	a++;
+	if (url == "/goodstype/getlist")
+	{
+		LOG_INFO("response:" << response.c_str());
+	}
 
 	if (ret == 0)
 	{
 		//ret为0表示没有出错
-		int b = a;
 		return true;
 	}
 	else
@@ -181,8 +182,6 @@ bool CLewaimaiHttpClient::Request(std::string url, std::map<string, string> para
 		LOG_INFO("request error, ret value:" << ret);
 	}
 
-	int b = a;
-
 	return false;
 }
 

BIN
lewaimai_pos_windows/resource/lewaimai_pos_windows.aps


BIN
lewaimai_pos_windows/resource/lewaimai_pos_windows.rc


+ 10 - 0
lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1213,6 +1213,16 @@ 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();
+			}
+
             //预设选项
             if(order.m_order_field.size() > 1)
             {