标签打印机增加60*50mm

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

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

bin/Win32/Release/setup/乐外卖接单软件安装脚本.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.0.3.8"
+!define PRODUCT_VERSION "1.0.3.9"
 !define PRODUCT_PUBLISHER "深圳市迅享科技有限公司"
 !define PRODUCT_WEB_SITE "https://www.lewaimai.com"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

lewaimai_pos_windows/tool/CPosPrinter.cpp

@@ -1017,6 +1017,11 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 		biaoqian_width = 30;
 		biaoqian_height = 20;
 	}
+	else  if (printer_guige == "60*50mm")
+	{
+		biaoqian_width = 60;
+		biaoqian_height = 50;
+	}
 	else
 	{
 		biaoqian_width = 40;
@@ -1083,7 +1088,10 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 
             //打印份数
             std::string numInfo = to_string(curFoodNum) + "/" + to_string(foodNum);
-            textData += BIAOQIAN_TEXTGet(numInfo, 180, 6, 1, 1);
+
+			//计算份数的位置
+			int nFenshuLeft = (biaoqian_width - 8) * 8;
+			textData += BIAOQIAN_TEXTGet(numInfo, nFenshuLeft, 6, 1, 1);
 
             //每行最多显示12个汉字，这里要计算一下换行（要先转成ANSI格式）
             std::string handle_food_name = CLewaimaiString::UTF8ToANSI(food_name);
@@ -1131,6 +1139,10 @@ void CPosPrinter::PrintWaimaiOrderBiaoqian(CWaimaiOrder& order)
 			{
 				nPriceY = 90;
 			}
+			else if (biaoqian_height == 50)
+			{
+				nPriceY = 330;
+			}
 
             //打印价格
             std::string priceInfo = CLewaimaiString::UTF8ToANSI(food_price) + "元";

lewaimai_pos_windows/wnd/CMainWnd.cpp

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