开始处理windows接单软件问题

bin/Win32/Debug/lewaimai_pos_windows/skin/setting.xml

@@ -159,6 +159,7 @@
 							<ListLabelElement text="30*20mm" />
 							<ListLabelElement text="60*50mm" />
 							<ListLabelElement text="50*40mm" />
+							<ListLabelElement text="40*60mm" />
 						</Combo>
 					</HorizontalLayout>
 					

bin/Win32/Release/lewaimai_pos_windows/log/pos.log

@@ -0,0 +1,8 @@
+2022-05-10 21:51:03[INFO] - folderPath:D:\work\lewaimai_pos_windows\bin\Win32\Release\lewaimai_pos_windows\db，没有找到对应的目录，即将创建 [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:11]
+2022-05-10 21:51:03[INFO] - 新建 db 目录成功！ [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:18]
+2022-05-10 21:51:03[INFO] - create table success [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:178]
+2022-05-10 21:51:03[INFO] - fount field [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:249]
+2022-05-10 21:51:03[INFO] - fount field [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\csqlite3.cpp:314]
+2022-05-10 21:51:16[INFO] - 可用的USB打印机数量：0 [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\cposprinter.cpp:29]
+2022-05-10 21:51:16[INFO] - 可用的USB打印机数量：0 [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\tool\cposprinter.cpp:29]
+2022-05-10 21:51:17[INFO] - response:{"errcode":0,"errmsg":"ok","data":{"goods_types":[{"type_id":"2440896","name":"\u9152\u6c34\u996e\u6599","tag":"7","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2445321","name":"\u7c73\u996d","tag":"-11","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914357","name":"\u4e09\u5927\u62db\u724c\u83dc","tag":"-10","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914358","name":"\u4e5d\u5927\u5fc5\u70b9\u83dc","tag":"-9","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914359","name":"\u5bb6\u5e38\u7ecf\u5178","tag":"-8","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914360","name":"\u6e05\u65b0\u852c\u83dc","tag":"-7","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914361","name":"\u84b8\u5473\u83dc","tag":"-6","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914362","name":"\u597d\u6c64\u996e","tag":"-5","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2914363","name":"\u4f11\u95f2\u5c0f\u5403","tag":"-4","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"},{"type_id":"2933675","name":"\u65b0\u54c1\u4e0a\u5e02","tag":"0","is_weekshow":"0","week":[],"shop_id":"463581","shopname":"\u59d1\u5976\u5976\u53a8\u623f"}]}} [d:\work\lewaimai_pos_windows\lewaimai_pos_windows\network\clewaimaihttpclient.cpp:171]

lewaimai_pos_windows/control/CWaimaiOrderInfoUI.cpp

@@ -101,7 +101,7 @@ void CWaimaiOrderInfoUI::Refresh(CWaimaiOrder& order)
 		CLabelUI *pDabaoFee = new CLabelUI;
 		pDabaoFee->SetFixedHeight(30);
 
-		wstring dabao_fee = L"打包费：" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString((double)order.m_delivery, 2));
+		wstring dabao_fee = L"打包费：" + CLewaimaiString::UTF8ToUnicode(order.m_dabao_money);
 		pDabaoFee->SetText(dabao_fee.c_str());
 
 		pFeesLayout->Add(pDabaoFee);

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1027,6 +1027,11 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 		biaoqian_width = 50;
 		biaoqian_height = 40;
 	}
+	else  if (printer_guige == "40*60mm")
+	{
+		biaoqian_width = 40;
+		biaoqian_height = 60;
+	}
 	else
 	{
 		biaoqian_width = 40;
@@ -1152,6 +1157,10 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 			{
 				nPriceY = 250;
 			}
+			else if (biaoqian_height == 60)
+			{
+				nPriceY = 410;
+			}
 
             //打印价格
             std::string priceInfo = CLewaimaiString::UTF8ToANSI(food_price) + "元";

lewaimai_pos_windows/wnd/CMainWnd.cpp

@@ -1183,6 +1183,10 @@ void CMainWnd::HandleItemSelectMsg(TNotifyUI& msg)
 		{
 			CSetting::SetParam("setting_biaoqian_printer_guige", "50*40mm");
 		}
+		else if (com->GetCurSel() == 6)
+		{
+			CSetting::SetParam("setting_biaoqian_printer_guige", "40*60mm");
+		}
 	}
 	else if (name == _T("setting_biaoqian_printer_fangxiang"))
 	{
@@ -2068,6 +2072,12 @@ void CMainWnd::InitSettingStatus()
 		com->SelectItem(5, false, false);
 		com->SetText(L"50*40mm");
 	}
+	else if (setting_biaoqian_printer_guige == "40*60mm")
+	{
+		com->SetInternVisible(true);
+		com->SelectItem(6, false, false);
+		com->SetText(L"40*60mm");
+	}
 
 	com = static_cast<CComboUI*>(m_pm.FindControl(_T("setting_biaoqian_printer_fangxiang")));
 	std::string setting_biaoqian_printer_fangxiang = CSetting::GetParam("setting_biaoqian_printer_fangxiang");