预包装打印完成

bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml

@@ -7,51 +7,58 @@
 			<Control width="1" bkcolor="#FFD1D1D1"></Control>
 				
 			<VerticalLayout width="380" bkcolor="#FFFFFFFF" padding="0,0,0,0">
-				<HorizontalLayout name="diandan_page_chengzhong_layout" height="100">
+				<HorizontalLayout name="yubaozhuangbiaoqian_page_chengzhong_layout" height="100">
 					<VerticalLayout width="80">
-						<Control name="diandan_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,28,23,36" mouse="false"></Control>
-						<Label name="diandan_page_label_chengzhong_wending" text="稳定" height="20" padding="30,20,0,0" font="14"></Label>
+						<Control name="yubaozhuangbiaoqian_page_status_chengzhong_wending" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,28,23,36" mouse="false"></Control>
+						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_wending" text="稳定" height="20" padding="30,20,0,0" font="14"></Label>
 
-						<Control name="diandan_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,68,23,76" mouse="false"></Control>
-						<Label name="diandan_page_label_chengzhong_jingzhong" text="净重" height="20" padding="30,20,0,0" font="14"></Label>
+						<Control name="yubaozhuangbiaoqian_page_status_chengzhong_jingzhong" bkimage="deng_off.png" width="8" height="8" float="true" pos="15,68,23,76" mouse="false"></Control>
+						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_jingzhong" text="净重" height="20" padding="30,20,0,0" font="14"></Label>
 					</VerticalLayout>							
 
 					<HorizontalLayout width="200">
-						<Label name="diandan_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF3CB371" font="140"></Label>
-						<Label name="diandan_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"></Label>
+						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_value" text="0.000" align="right" width="135" height="40" padding="0,35,0,0" textcolor="#FF3CB371" font="140"></Label>
+						<Label name="yubaozhuangbiaoqian_page_label_chengzhong_unit" text="公斤" height="30" padding="15,40,0,0" font="16"></Label>
 					</HorizontalLayout>
 
 					<VerticalLayout>
-						<Button name="diandan_page_chengzhong_zhiling" visible="false" width="80" height="32" padding="10,10,10,0" text="置零" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-						<Button name="diandan_page_chengzhong_qupi" visible="false" width="80" height="32" padding="10,15,10,0" text="去皮" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+						<Button name="yubaozhuangbiaoqian_page_chengzhong_zhiling" visible="false" width="80" height="32" padding="10,10,10,0" text="置零" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+						<Button name="yubaozhuangbiaoqian_page_chengzhong_qupi" visible="false" width="80" height="32" padding="10,15,10,0" text="去皮" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
 
 					</VerticalLayout>
 				</HorizontalLayout>
 
 				<Control height="1" bkcolor="#FFEBE8E8"></Control>	
+
+				<VerticalLayout padding="0,30,0,0">
+					<Label text="1、打印条码前，先前往设置中心设置好标签打印机的参数" textcolor="#FF999999" wordbreak="true" height="40" padding="20,10,20,0" font="14"></Label>
+					<Label text="2、称重商品请提前设置好商品PLU编码，先把商品放在秤上称重，等待读数稳定后再点击商品即可打印条码" textcolor="#FF999999" wordbreak="true" height="40" padding="20,10,20,0" font="14"></Label>
+					<Label text="3、称重商品条码为13位【FFWWWWWNNNNNC】，请在收银机的条码秤设置选择同样的格式即可扫码识别" textcolor="#FF999999" wordbreak="true" height="40" padding="20,10,20,0" font="14"></Label>
+					<Label text="4、非称重商品请提前设置好商品条码，直接点击商品即可打印条码" textcolor="#FF999999" wordbreak="true" height="40" padding="20,10,20,0" font="14"></Label>
+				</VerticalLayout>	
 			</VerticalLayout>
 			
 			<Control width="1" bkcolor="#FFEBE8E8"></Control>
 			
-			<VerticalLayout name="diandan_food_layout">
-				<VerticalLayout name="diandan_fenlei_layout_scrolllayout" vscrollbar="true">
-					<Container name="diandan_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+			<VerticalLayout name="yubaozhuangbiaoqian_food_layout">
+				<VerticalLayout name="yubaozhuangbiaoqian_fenlei_layout_scrolllayout" vscrollbar="true">
+					<Container name="yubaozhuangbiaoqian_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
 
 					</Container>
 				</VerticalLayout>
 				
-				<TileLayout name="diandan_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
+				<TileLayout name="yubaozhuangbiaoqian_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 				
 				</TileLayout>
 				
 				<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-					<Edit name="diandan_food_search_edit" tooltip="请输入商品名字搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+					<Edit name="yubaozhuangbiaoqian_food_search_edit" tooltip="请输入商品名字搜索" width="380" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
 					
-					<Label name="diandan_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
+					<Label name="yubaozhuangbiaoqian_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
 					
 					<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
 					
-					<Button name="diandan_food_search_clear" visible="false" width="23" height="23" pos="365,23,388,46" float="true" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png"></Button>
+					<Button name="yubaozhuangbiaoqian_food_search_clear" visible="false" width="23" height="23" pos="365,23,388,46" float="true" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png"></Button>
 				</HorizontalLayout>
 			</VerticalLayout>
 		</HorizontalLayout>

zhipuzi_pos_windows/helper/CLewaimaiString.cpp

@@ -537,6 +537,23 @@ std::string CLewaimaiString::GetQuweima(std::wstring input)
 	return result;
 }
 
+std::string CLewaimaiString::GetBarcodeCheckCode(const std::string& barcode)
+{
+	if (barcode.length() != 12 || !CLewaimaiString::is_only_number(barcode))
+	{
+		return "";
+	}
+
+	int sum = 0;
+	for (size_t i = 0; i < barcode.length(); ++i)
+	{
+		int digit = barcode[i] - '0';
+		sum += digit * (i % 2 == 0 ? 1 : 3);
+	}
+
+	return std::to_string((10 - sum % 10) % 10);
+}
+
 std::string CLewaimaiString::SqlZhuanyi(std::string old)
 {
 	CLewaimaiString::string_replace(old, "'", "''");

zhipuzi_pos_windows/helper/CLewaimaiString.h

@@ -61,6 +61,9 @@ public:
 	//用于条码标签秤，把Unicode格式的字符串（可以中英文混写）转换成用于条码秤的区位码
 	static std::string GetQuweima(std::wstring input);
 
+	//根据条码前12位，按照EAN-13规则生成第13位校验码
+	static std::string GetBarcodeCheckCode(const std::string& barcode);
+
 	//把字符串中的单引号'转化成2个单引号''，这样就可以插入到sqllite中，并且插入进去之后就是一个单引号
 	static std::string SqlZhuanyi(std::string old);
 

zhipuzi_pos_windows/page/CYubaozhuangbiaoqianPageUI.cpp

@@ -53,7 +53,7 @@ void CYubaozhuangbiaoqianPageUI::InitShow()
 	//再初始化商品显示
 	this->InitFoodShow();
 
-	CHorizontalLayoutUI* chegnzhongLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("diandan_page_chengzhong_layout")));
+	CHorizontalLayoutUI* chegnzhongLayout = static_cast<CHorizontalLayoutUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_page_chengzhong_layout")));
 	if (CSetting::GetInstance()->GetParam("setting_dianzicheng_is_lianjie") == "0")
 	{
 		chegnzhongLayout->SetVisible(false);
@@ -80,7 +80,7 @@ void CYubaozhuangbiaoqianPageUI::RefreshShow()
 void CYubaozhuangbiaoqianPageUI::InitFoodtypeShow()
 {
 	//初始化商品渲染相关的信息
-	m_foodtypeLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("diandan_fenlei_layout")));
+	m_foodtypeLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_fenlei_layout")));
 	m_foodtypeLayout->RemoveAll();
 
 	std::string is_ai_shibie = CSetting::GetInstance()->GetParam("setting_is_ai_recognition_open");
@@ -126,7 +126,7 @@ void CYubaozhuangbiaoqianPageUI::InitFoodtypeShow()
 
 		pItem->SetName(L"AI识别结果");
 		pItem->SetTypeId("ai");
-		pItem->SetGroup(L"diandan_foodtype");
+		pItem->SetGroup(L"yubaozhuangbiaoqian_foodtype");
 
 		m_foodtypeLayout->Add(pItem);
 
@@ -147,7 +147,7 @@ void CYubaozhuangbiaoqianPageUI::InitFoodtypeShow()
 		pItem->SetName(L"商品套餐");
 		pItem->SetTypeId("taocan");
 		pItem->SetTaocan();
-		pItem->SetGroup(L"diandan_foodtype");
+		pItem->SetGroup(L"yubaozhuangbiaoqian_foodtype");
 
 		m_foodtypeLayout->Add(pItem);
 
@@ -169,7 +169,7 @@ void CYubaozhuangbiaoqianPageUI::InitFoodtypeShow()
 
 		pItem->SetName(CLewaimaiString::UTF8ToUnicode(type.name));
 		pItem->SetTypeId(type.id);
-		pItem->SetGroup(L"diandan_foodtype");
+		pItem->SetGroup(L"yubaozhuangbiaoqian_foodtype");
 
 		m_foodtypeLayout->Add(pItem);
 
@@ -213,7 +213,7 @@ void CYubaozhuangbiaoqianPageUI::UpdateFoodtypePos()
 
 	int num = 0;
 
-	CContainerUI* pFenleiLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("diandan_fenlei_layout")));
+	CContainerUI* pFenleiLayout = static_cast<CContainerUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_fenlei_layout")));
 
 	for (int i = 0; i < nFoodtypeNum; i++)
 	{
@@ -245,7 +245,7 @@ void CYubaozhuangbiaoqianPageUI::UpdateFoodtypePos()
 	pFenleiLayout->SetFixedHeight(lastRow * 52 + 10);
 
 	//处理滚动条问题
-	CVerticalLayoutUI* pFenleiScrollLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_fenlei_layout_scrolllayout")));
+	CVerticalLayoutUI* pFenleiScrollLayout = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_fenlei_layout_scrolllayout")));
 	if (lastRow > 2)
 	{
 		lastRow = 2;
@@ -263,7 +263,7 @@ void CYubaozhuangbiaoqianPageUI::InitFoodShow()
 {
 	std::string setting_xianshi_is_youtu = CSetting::GetInstance()->GetParam("setting_xianshi_is_youtu");
 
-	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("diandan_foodlist")));
+	m_foodLayout = static_cast<CTileLayoutUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_foodlist")));
 	m_foodLayout->RemoveAll();
 
 	std::wstring xml_name;
@@ -444,23 +444,18 @@ void CYubaozhuangbiaoqianPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		this->ClickFoodAction();
 	}
-	else if (name == L"diandan_food_search_clear")
+	else if (name == L"yubaozhuangbiaoqian_food_search_clear")
 	{
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("diandan_food_search_edit")));
+		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("yubaozhuangbiaoqian_food_search_edit")));
 		m_pEdit->SetText(L"");
 
 		StopSerachFood();
 	}
-	else if (name == L"btn_diandan_qianxiang")
-	{
-		CPosPrinter printer;
-		printer.OpenQianxiang();
-	}
-	else if (name == L"diandan_page_chengzhong_zhiling")
+	else if (name == L"yubaozhuangbiaoqian_page_chengzhong_zhiling")
 	{
 		this->ZhiLing();
 	}
-	else if (name == L"diandan_page_chengzhong_qupi")
+	else if (name == L"yubaozhuangbiaoqian_page_chengzhong_qupi")
 	{
 		this->Qupi();
 	}
@@ -474,7 +469,7 @@ void CYubaozhuangbiaoqianPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	COptionUI* curOption = static_cast<COptionUI*>(msg.pSender);
 	std::wstring groupname = curOption->GetGroup();
 
-	if (groupname == L"diandan_foodtype")
+	if (groupname == L"yubaozhuangbiaoqian_foodtype")
 	{
 		//商品分类切换
 		CFoodtypeOptionUI* typeUI = static_cast<CFoodtypeOptionUI*>(curOption);
@@ -504,10 +499,10 @@ void CYubaozhuangbiaoqianPageUI::HandleTextChangedMsg(TNotifyUI& msg)
 {
 	CDuiString name = msg.pSender->GetName();
 
-	if (name == L"diandan_food_search_edit")
+	if (name == L"yubaozhuangbiaoqian_food_search_edit")
 	{
 		//商品搜索框的输入事件
-		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("diandan_food_search_edit")));
+		CEditUI* m_pEdit = static_cast<CEditUI*>(m_pManager->FindControl(_T("yubaozhuangbiaoqian_food_search_edit")));
 		std::wstring ws_Value = m_pEdit->GetText();
 		std::string strValue = CLewaimaiString::UnicodeToUTF8(ws_Value);
 
@@ -588,7 +583,7 @@ void CYubaozhuangbiaoqianPageUI::ClickFoodAction()
 			}
 
 			//这里要判断是直接区域称重，还是先弹框再称重
-			CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_label_chengzhong_value")));
+			CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_page_label_chengzhong_value")));
 			std::wstring ws_weight_value = pLabel->GetText();
 			std::string s_weight_value = CLewaimaiString::UnicodeToUTF8(ws_weight_value);
 			if (atof(s_weight_value.c_str()) < 0.001)
@@ -619,11 +614,11 @@ void CYubaozhuangbiaoqianPageUI::ClickFoodAction()
 void CYubaozhuangbiaoqianPageUI::StartSearchFood(std::string foodname)
 {
 	//展示删除按钮
-	CButtonUI* pClear = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_food_search_clear")));
+	CButtonUI* pClear = static_cast<CButtonUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_food_search_clear")));
 	pClear->SetVisible(true);
 
 	//隐藏商品分类展示
-	CVerticalLayoutUI* pFoodtype = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_fenlei_layout_scrolllayout")));
+	CVerticalLayoutUI* pFoodtype = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_fenlei_layout_scrolllayout")));
 	pFoodtype->SetVisible(false);
 
 	if (m_cur_type_id != "sousuo")
@@ -635,7 +630,7 @@ void CYubaozhuangbiaoqianPageUI::StartSearchFood(std::string foodname)
 
 	m_sousuo_foodname = foodname;
 
-	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_food_search_tishi")));
+	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_food_search_tishi")));
 	pTishi->SetVisible(false);
 
 	this->InitFoodShow();
@@ -645,16 +640,16 @@ void CYubaozhuangbiaoqianPageUI::StartSearchFood(std::string foodname)
 void CYubaozhuangbiaoqianPageUI::StopSerachFood()
 {
 	//隐藏删除按钮
-	CButtonUI* pClear = static_cast<CButtonUI*>(this->FindSubControl(_T("diandan_food_search_clear")));
+	CButtonUI* pClear = static_cast<CButtonUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_food_search_clear")));
 	pClear->SetVisible(false);
 
 	//展示商品分类展示
-	CVerticalLayoutUI* pFoodtype = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("diandan_fenlei_layout_scrolllayout")));
+	CVerticalLayoutUI* pFoodtype = static_cast<CVerticalLayoutUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_fenlei_layout_scrolllayout")));
 	pFoodtype->SetVisible(true);
 
 	m_cur_type_id = m_type_id_before_sousuo;
 
-	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_food_search_tishi")));
+	CLabelUI* pTishi = static_cast<CLabelUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_food_search_tishi")));
 	pTishi->SetVisible(true);
 
 	this->InitFoodShow();
@@ -692,7 +687,7 @@ void CYubaozhuangbiaoqianPageUI::HandleChengzhongValueChange()
 {
 	std::string weight = CChengzhongWorker::GetInstance()->GetWeight();
 
-	CControlUI* pWendingStatus = static_cast<CControlUI*>(this->FindSubControl(_T("diandan_page_status_chengzhong_wending")));
+	CControlUI* pWendingStatus = static_cast<CControlUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_page_status_chengzhong_wending")));
 	if (CChengzhongWorker::GetInstance()->GetIsWending() == true)
 	{
 		pWendingStatus->SetBkImage(L"deng_on.png");
@@ -702,7 +697,7 @@ void CYubaozhuangbiaoqianPageUI::HandleChengzhongValueChange()
 		pWendingStatus->SetBkImage(L"deng_off.png");
 	}
 
-	CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_label_chengzhong_value")));
+	CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("yubaozhuangbiaoqian_page_label_chengzhong_value")));
 	pLabel->SetText(CLewaimaiString::UTF8ToUnicode(weight).c_str());
 }
 

zhipuzi_pos_windows/print/CPosPrinterData.cpp

@@ -4459,11 +4459,11 @@ std::string CPosPrinterData::PrintShangpintiaomaBiaoqian(CFood& foodinfo, std::s
 
 		if (is_big_name)
 		{
-			textData += BIAOQIAN_TEXTGet(*it, 12, 12 + 60 * nRow, 1, 2);
+			textData += BIAOQIAN_TEXTGet(*it, 0, 12 + 60 * nRow, 1, 2);
 		}
 		else
 		{
-			textData += BIAOQIAN_TEXTGet(*it, 12, 12 + 30 * nRow, 1, 1);
+			textData += BIAOQIAN_TEXTGet(*it, 0, 12 + 30 * nRow, 1, 1);
 		}
 
 		nRow++;
@@ -4476,14 +4476,18 @@ std::string CPosPrinterData::PrintShangpintiaomaBiaoqian(CFood& foodinfo, std::s
 		std::string weightString = CLewaimaiString::DoubleToString(atof(weight.c_str()) * 1000, 0);
 		weightString = CLewaimaiString::BuZifuLeft(weightString, 5 - weightString.length(), '0');
 
-		barcode = "21" + CLewaimaiString::BuZifuLeft(foodinfo.weight_plu_code, 5 - foodinfo.weight_plu_code.length(), '0') + weightString + "1";
+		barcode = "21" + CLewaimaiString::BuZifuLeft(foodinfo.weight_plu_code, 5 - foodinfo.weight_plu_code.length(), '0') + weightString;
+
+		std::string checkCode = CLewaimaiString::GetBarcodeCheckCode(barcode);
+
+		barcode += checkCode;
 	}
 	else
 	{
 		barcode = foodinfo.barcode;
 	}
 
-	BIAOQIAN_BARCODEOUT(barcode, 12, 22 + 30 * nRow);
+	BIAOQIAN_BARCODEOUT(barcode, 0, 22 + 30 * nRow);
 
 	int nPriceY;
 	if (biaoqian_height == 30)
@@ -4503,31 +4507,31 @@ std::string CPosPrinterData::PrintShangpintiaomaBiaoqian(CFood& foodinfo, std::s
 	{
 		//打印单价
 		std::string priceInfo = CLewaimaiString::UnicodeToGBK(L"单价：");
-		textData += BIAOQIAN_TEXTGet(priceInfo, 12, nPriceY, 1, 1);
+		textData += BIAOQIAN_TEXTGet(priceInfo, 0, nPriceY, 1, 1);
 
 		std::string priceShow = CLewaimaiString::UTF8ToGBK(food_price) + CLewaimaiString::UnicodeToGBK(L"元");
-		textData += BIAOQIAN_TEXTGet(priceShow, 12, nPriceY + 30, 1, 1);
+		textData += BIAOQIAN_TEXTGet(priceShow, 0, nPriceY + 30, 1, 1);
 		
 
 		//打印净重
 		std::string weightInfo = CLewaimaiString::UnicodeToGBK(L"净重：");
-		textData += BIAOQIAN_TEXTGet(weightInfo, 112, nPriceY, 1, 1);
+		textData += BIAOQIAN_TEXTGet(weightInfo, 100, nPriceY, 1, 1);
 		
 		std::string weightShow = weight + CLewaimaiString::UnicodeToGBK(L"kg");
-		textData += BIAOQIAN_TEXTGet(weightShow, 112, nPriceY + 30, 1, 1);
+		textData += BIAOQIAN_TEXTGet(weightShow, 100, nPriceY + 30, 1, 1);
 
 		//打印净重
 		std::string zongjiaInfo = CLewaimaiString::UnicodeToGBK(L"总价：");
-		textData += BIAOQIAN_TEXTGet(zongjiaInfo, 212, nPriceY, 1, 1);
+		textData += BIAOQIAN_TEXTGet(zongjiaInfo, 200, nPriceY, 1, 1);
 
-		std::string zongjiaShow = CLewaimaiString::DoubleToString(atof(CLewaimaiString::UTF8ToGBK(food_price).c_str()) * atof(weight.c_str()), 3) + CLewaimaiString::UnicodeToGBK(L"元");
-		textData += BIAOQIAN_TEXTGet(zongjiaShow, 212, nPriceY + 30, 1, 1);
+		std::string zongjiaShow = CLewaimaiString::DoubleToString(atof(CLewaimaiString::UTF8ToGBK(food_price).c_str()) * atof(weight.c_str()), 2) + CLewaimaiString::UnicodeToGBK(L"元");
+		textData += BIAOQIAN_TEXTGet(zongjiaShow, 200, nPriceY + 30, 1, 1);
 	}
 	else
 	{
 		//打印价格
 		std::string priceInfo = CLewaimaiString::UnicodeToGBK(L"单价：") + CLewaimaiString::UTF8ToGBK(food_price) + CLewaimaiString::UnicodeToGBK(L"元");
-		textData += BIAOQIAN_TEXTGet(priceInfo, 12, nPriceY, 1, 1);
+		textData += BIAOQIAN_TEXTGet(priceInfo, 0, nPriceY, 1, 1);
 	}