连锁店账号，支持多店的厨房打印

派工单增加店铺名字

lewaimai_pos_windows/network/CLewaimaiHttpClient.cpp

@@ -98,11 +98,7 @@ bool CLewaimaiHttpClient::Login(std::string& errmsg)
 		}
 
 		m_client.m_shop_ids = m_client.m_shop_ids.substr(0, m_client.m_shop_ids.length() - 1);
-		
-		std::string a = m_client.m_shop_ids;
 	}
-
-	//LOG_INFO("login success!");
 	
 	return true;
 }
@@ -187,3 +183,8 @@ std::string CLewaimaiHttpClient::getShopId()
 {
 	return m_client.m_shop_id;
 }
+
+std::string CLewaimaiHttpClient::getShopIdS()
+{
+	return m_client.m_shop_ids;
+}

lewaimai_pos_windows/network/CLewaimaiHttpClient.h

@@ -17,6 +17,8 @@ public:
 
 	static std::string getShopId();
 
+	static std::string getShopIdS();
+
 public:
 	static CLewaimaiHttpClient m_client;
 

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1191,6 +1191,9 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
             POS_TextOut("派工单", true, true, 1);
             POS_FeedLine();
 
+			POS_TextOut(CLewaimaiString::UTF8ToANSI(order.m_shop_name), false, false, 1);
+			POS_FeedLine();
+
             POS_FeedLine();
 
             string order_type = "#" + order.m_restaurant_number + "  ";

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -1941,7 +1941,7 @@ void CMainWnd::InitSettingStatus()
     //先清空一次分类（主要考虑退出登陆重新登录的情况）
     CSetting::ClearFoodtype();
 
-	std::string shop_id = CLewaimaiHttpClient::getShopId();
+	std::string shop_id = CLewaimaiHttpClient::getShopIdS();
 	if (shop_id != "0")
 	{
 		std::map<string, string> params;
@@ -1987,7 +1987,8 @@ void CMainWnd::InitSettingStatus()
 			rapidjson::Value& v_row_i = v_rows[i];
 
 			std::string type_id = v_row_i["type_id"].GetString();
-			std::string name = v_row_i["name"].GetString();
+			std::string shopname = v_row_i["shopname"].GetString();
+			std::string name = CLewaimaiString::UnicodeToUTF8(L"【") + shopname + CLewaimaiString::UnicodeToUTF8(L"】") + v_row_i["name"].GetString();
 
 			CSetting::AddFoodtype(name, type_id);
 		}