修复几个bug

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -65,11 +65,13 @@ void CDiandanPageUI::InitShow()
 
 void CDiandanPageUI::RefreshShow()
 {
+	//清空当前订单的信息
+	m_cur_diandan_order.RefreshDiandanInfo();
+
 	//初始化商品显示（因为这里要刷新商品库存状态）
 	this->InitFoodShow();
 
 	//清空购物车
-	m_cur_diandan_order.Clear();
 	this->ClearDiandanOrderItemShow();
 
 	//初始化结算页面相关的展示，把所有活动清零
@@ -341,6 +343,10 @@ void CDiandanPageUI::InitJiesuanShow()
 	CButtonUI* pCanpaiEdit = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_canpaihao")));
 	pCanpaiEdit->SetText(L"输入餐牌号");
 
+	//整单备注
+	CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_label_zhengdanbeizhu")));
+	pLabel->SetText(L"整单备注：");
+
 	//再初始化取单数量
 	RefreshGuadanNum();
 

zhipuzi_pos_windows/tool/CSqlite3.cpp

@@ -1024,7 +1024,18 @@ bool CSqlite3::UpdateOneFood(rapidjson::Value& foodrows)
 	std::string member_price = foodinfo["member_price"].GetString();
 	std::string buying_price = foodinfo["buying_price"].GetString();
 	std::string stock = to_string(foodinfo["stock"].GetDouble());
-	std::string stockvalid = "1";
+
+	std::string stockvalid;
+	std::string stock_status = foodinfo["stock_status"].GetString();
+	if (stock_status == "OPEN")
+	{
+		stockvalid = "1";
+	}
+	else
+	{
+		stockvalid = "0";
+	}
+	
 	std::string stock_warning = to_string(foodinfo["stock_warning"].GetDouble());
 	std::string is_shouyinji_show = foodinfo["is_shouyinji_show"].GetString();
 	std::string expiration_date = foodinfo["expiration_date"].GetString();

zhipuzi_pos_windows/zhipuzi/CDiandanOrder.cpp

@@ -1,6 +1,52 @@
 #include "../pch/pch.h"
 #include "CDiandanOrder.h"
 
+void CDiandanOrder::RefreshDiandanInfo()
+{
+	m_items.clear();
+
+	m_total_price_show = "";
+	m_guadan_time = "";
+	m_memo = "";
+
+	shopname = "";
+	take_food_code = "";
+	show_trade_no = "";
+	balance = "";
+	member_number = "";
+	m_renshu = "";
+	shoukuan_type = "";
+
+	int order_from = 1;
+
+	init_time = "";
+	m_shangpinquan_youhui = "";
+	m_cika_youhui = "";
+	m_total_member_youhui = "";
+	m_zhekou_youhui = "";
+	m_member_zhekou_youhui = "";
+	m_quanyika_youhui = "";
+	m_manjian_youhui = "";
+	m_youhuiquan_youhui = "";
+	m_rengong_youhui = "";
+	m_moling_youhui = "";
+	m_jiajia = "";
+	m_shishou_value = "";
+	m_zhaoling_value = "";
+	m_zhekou_value = "";
+	m_dabao_money = "";
+	m_total_price = "";
+	m_canpai = "";
+
+	m_items_print.clear();
+
+	m_order_id = "";
+	is_refund = "";
+	refund_time = "";
+	is_guazhang = "";
+	guazhang = "";
+}
+
 int CDiandanOrder::getItemNum()
 {
 	return m_items.size();
@@ -175,8 +221,6 @@ void CDiandanOrder::SetDabao(int index)
 void CDiandanOrder::Clear()
 {
 	m_items.clear();
-
-	m_items_print.clear();
 }
 
 void CDiandanOrder::SetMemo(std::string memo)

zhipuzi_pos_windows/zhipuzi/CDiandanOrder.h

@@ -96,6 +96,9 @@ public:
 	std::string guazhang;
 
 public:
+	//刷新点单相关的参数，比如一个订单收银成功后准备开始收银下一个订单时，清空之前的信息
+	void RefreshDiandanInfo();
+
 	int getItemNum();
 
 	std::string getTotalPriceShow();