修复厨房打印的一些bug

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

@@ -144,15 +144,15 @@
 					<HorizontalLayout height="44" padding="0,30,0,20">
 						<Button name="setting_new_chufang_printer_btn" align="center" width="200" height="38" padding="0,3,0,3" text="新建厨房打印机" normalimage="file='Btn_White.png' corner='5,5,5,5'" hotimage="file='Btn_White_Hover.png' corner='5,5,5,5'" pushedimage="file='Btn_White_Click.png' corner='5,5,5,5'" />
 					</HorizontalLayout>
-					<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FF000000" itemlinecolor="#FF000000" vscroll="true">
+					<List name="setting_chufang_printer_list" bordersize="1" bordercolor="#FF000000" itemlinecolor="#FF000000" vscrollbar="true" hscrollbar="true">
 						<ListHeader />
-						<ListHeaderItem text="打印机名称" width="200" align="center" />
-						<ListHeaderItem text="IP地址" width="200" align="center" />
-						<ListHeaderItem text="打印机规格" width="100" align="center" />
-						<ListHeaderItem text="商品分单打印" width="100" align="center" />
-						<ListHeaderItem text="按商品分类打印" width="200" align="center" />
-						<ListHeaderItem text="关联商品分类" width="200" align="center" />
-						<ListHeaderItem text="操作" align="center" />
+						<ListHeaderItem text="打印机名称" width="180" align="center" />
+						<ListHeaderItem text="IP地址" width="150" align="center" />
+						<ListHeaderItem text="打印机规格" width="150" align="center" />
+						<ListHeaderItem text="商品分单打印" width="150" align="center" />
+						<ListHeaderItem text="按商品分类打印" width="150" align="center" />
+						<ListHeaderItem text="关联商品分类" width="300" align="center" />
+						<ListHeaderItem text="操作" width="200" align="center"/>
 					</List> 
 				</VerticalLayout>
 

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

@@ -3,15 +3,15 @@
 <Window> 
 	<ListContainerElement name="setting_chufang_printer_item" height="80"> 
 		<HorizontalLayout> 
-			<Label name="setting_chufang_printer_item_name" width="200" align="center"/> 
-			<Label name="setting_chufang_printer_item_ip" width="200" align="center"/> 
-			<Label name="setting_chufang_printer_guige" width="100" align="center"/>
-			<Label name="setting_chufang_printer_fendan" width="100" align="center"/> 
-			<Label name="setting_chufang_printer_item_fenlei" width="200" align="center"/> 
+			<Label name="setting_chufang_printer_item_name" width="180" height="80" align="center"/> 
+			<Label name="setting_chufang_printer_item_ip" width="150" align="center"/> 
+			<Label name="setting_chufang_printer_guige" width="150" align="center"/>
+			<Label name="setting_chufang_printer_fendan" width="150" align="center"/> 
+			<Label name="setting_chufang_printer_item_fenlei" width="150" align="center"/> 
 			<HorizontalLayout width="300" height="80" valign="center">
-				<Label name="setting_chufang_printer_item_fenlei_ids" width="300" multiline="true" align="center" valign="center"/> 
+				<Label name="setting_chufang_printer_item_fenlei_ids" width="200" multiline="true" align="center" valign="center"/> 
 			</HorizontalLayout>
-			<HorizontalLayout name="setting_chufang_printer_caozuo" align="center">
+			<HorizontalLayout name="setting_chufang_printer_caozuo" width="200" align="center">
 				<Control></Control>
 				<Button name="setting_chufang_printer_item_update_btn" align="center" width="26" height="27" padding="20,25,0,0" normalimage="file='Setting_Btn.png'" hotimage="file='Setting_Btn_Hover.png'" pushedimage="file='Setting_Btn_Active.png'" />
 				<Button name="setting_chufang_printer_item_delete_btn" align="center" width="18" height="18" padding="20,29,0,0" normalimage="file='Delete_Members_Icon.png'" hotimage="file='Delete_Members_Icon_Hover.png'" pushedimage="file='Delete_Members_Icon_Click.png'" />

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

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "乐外卖接单软件"
-!define PRODUCT_VERSION "1.0.2.9"
+!define PRODUCT_VERSION "1.0.3.0"
 !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

@@ -1103,6 +1103,14 @@ void CPosPrinter::PrintWaimaiOrderChufang(CWaimaiOrder& order)
 			}
 		}
 
+		if (cur_printer_use.size() == 0)
+		{
+			//如果这个厨房打印机没有商品可以打印（开启了商品分类打印可能出现），就直接跳过
+			m_socket.close();
+
+			continue;
+		}
+
         if(fendan == "0")
         {
             POS_Reset();