开始做换台功能

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -905,6 +905,10 @@ void CZhengcanDiandanPageUI::HandleClickMsg(TNotifyUI& msg)
 	{
 		this->ClickChetai();
 	}
+	else if (name == L"btn_diandan_huantai")
+	{
+		this->ClickHuantai();
+	}
 	else if (name == L"btn_diandan_tuicai")
 	{
 		this->ClickTuicai();
@@ -2483,6 +2487,19 @@ void CZhengcanDiandanPageUI::ClickChetai()
 	m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
 }
 
+void CZhengcanDiandanPageUI::ClickHuantai()
+{
+	CZhengcanPageUI* zhengcanPage = static_cast<CZhengcanPageUI*>(m_pMainWnd->GetPage(CMainWnd::ZHENGCAN));
+
+	//先切换到换台模式
+	zhengcanPage->SetModel(2);
+
+	//设置转出的桌子ID
+	zhengcanPage->SetHuantaiTableId(m_table_id);
+
+	m_pMainWnd->SwitchPage(CMainWnd::ZHENGCAN);
+}
+
 /**
  * 退菜功能，注意如果是套餐要把套餐本身的item的id和套餐商品记录的item的id一起传给服务器
  */
@@ -3695,8 +3712,8 @@ void CZhengcanDiandanPageUI::UpdateFoodStock(std::string food_stock)
 
 	for (rapidjson::SizeType i = 0; i < data.Size(); ++i)
 	{
-		std::string food_id = data[i]["food_id"].GetString();
-		std::string stock = data[i]["stock"].GetString();
+		std::string food_id = CLewaimaiJson::ToString(data[i]["food_id"]);
+		std::string stock = CLewaimaiJson::ToString(data[i]["stock"]);
 
 		CSqlite3 sqlite;
 		sqlite.UpdateFoodStock(food_id, stock);

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -107,6 +107,9 @@ public:
 	//点击撤台的逻辑
 	void ClickChetai();
 
+	//点击换台的逻辑
+	void ClickHuantai();
+
 	//点击退菜的逻辑
 	void ClickTuicai();
 

zhipuzi_pos_windows/page/CZhengcanPageUI.cpp

@@ -503,4 +503,14 @@ void CZhengcanPageUI::EnterTable(std::string table_id)
 	page->SetTableId(table_id);
 
 	m_pMainWnd->SwitchPage(CMainWnd::ZHENGCANDIANDAN);
+}
+
+void CZhengcanPageUI::SetModel(int nModel)
+{
+	m_nModel = nModel;
+}
+
+void CZhengcanPageUI::SetHuantaiTableId(std::string tableId)
+{
+	m_HuantaiTableId = tableId;
 }

zhipuzi_pos_windows/page/CZhengcanPageUI.h

@@ -55,6 +55,10 @@ public:
 
 	void ClickTableAction();
 
+	void SetModel(int nModel);
+
+	void SetHuantaiTableId(std::string tableId);
+
 private:
 	//执行开台动作，请求服务器
 	bool Kaitai(std::string table_id, std::string renshu);
@@ -85,4 +89,10 @@ private:
 
 	//当刷新桌子时
 	std::mutex m_table_mutex;
+
+	//表示当前的桌位显示模式 1：正常模式 2：换台模式
+	int m_nModel = 1;
+
+	//换台模式下，当前转出的桌子ID
+	std::string m_HuantaiTableId;
 };