1

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

@@ -37,8 +37,9 @@
 											
 					<List name="list_saomashouyin_cart" padding="0,0,0,0" itemlinecolor="#FF000000" itemvalign="vcenter" vscrollbar="true">
 						<ListHeader inset="10,0,0,0" height="42">
-							<ListHeaderItem text="商品" width="220" align="left" />
-							<ListHeaderItem text="条码" width="80" align="center" />
+							<ListHeaderItem text="序号" width="30" align="center" />
+							<ListHeaderItem text="商品" width="200" align="center" />
+							<ListHeaderItem text="条码" width="120" align="center" />
 							<ListHeaderItem text="单价" width="80" align="center" />
 							<ListHeaderItem text="数量" width="80" align="center" />
 							<ListHeaderItem text="小计" width="80" align="center" />
@@ -56,19 +57,21 @@
 						<HorizontalLayout height="50">
 							<Label name="saomashouyin_page_otherprice" text="" width="200" align="left" padding="15,14,0,0"></Label>
 							<Label name="saomashouyin_page_totalprice" text="总价：¥0.00" font="20" textcolor="#FFFF4444" width="150" align="right" padding="0,0,15,0"></Label>
-						</HorizontalLayout>
+							
+							<HorizontalLayout height="50">
+								<Button name="btn_saomashouyin_cundan" width="90" height="40" padding="10,10,10,0" text="存单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+								<Button name="btn_saomashouyin_qudan" width="90" height="40" padding="10,10,10,0" text="取单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+							
+								<Label name="saomashouyin_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" float="true" pos="85,325,104,344" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"></Label>
+							</HorizontalLayout>
 
-						<HorizontalLayout height="50">
-							<Button name="btn_saomashouyin_cundan" width="90" height="40" padding="10,10,10,0" text="存单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-							<Button name="btn_saomashouyin_qudan" width="90" height="40" padding="10,10,10,0" text="取单" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
-						
-							<Label name="saomashouyin_page_qudan_num" text="10" mouse="false" width="19" height="19" align="center" float="true" pos="85,325,104,344" textcolor="#FFFFFFFF" bkimage="num_bkg.png" bordercolor="#FFFF0000" bordersize="0"></Label>
-						</HorizontalLayout>
+							<Button name="btn_diandan_shanchu" width="90" height="40" padding="10,10,10,0" text="删除" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+						</HorizontalLayout>						
 
 						<HorizontalLayout height="50">
 							<Button name="btn_saomashouyin_zhengdanbeizhu" width="90" height="40" padding="10,10,10,0" text="整单备注" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						
-							<Button name="btn_saomashouyin_qianxiang" width="90" height="40" padding="10,10,10,30" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
+							<Button name="btn_saomashouyin_qianxiang" width="90" height="40" padding="10,10,10,0" text="打开钱箱" normalimage="file='btn_border_white.png' corner='5,5,5,5'" hotimage="file='btn_border_white_Hover.png' corner='5,5,5,5'" pushedimage="file='btn_border_white_Click.png' corner='5,5,5,5'" />
 						</HorizontalLayout>
 					</VerticalLayout>
 				</VerticalLayout>

zhipuzi_pos_windows/page/CSaomashouyinPageUI.cpp

@@ -700,18 +700,6 @@ bool CSaomashouyinPageUI::HandleCustomMessage(UINT uMsg, WPARAM wParam, LPARAM l
 
 		return true;
 	}
-	else if (uMsg == WM_AI_RECOGNITION_SUCCESS)
-	{
-		HandleDiandanAIShibieResult();
-
-		return true;
-	}
-	else if (uMsg == WM_CHENGZHONG_SUCCESS)
-	{
-		HandleChengzhongValueChange();
-
-		return true;
-	}
 
 	return false;
 }
@@ -3231,29 +3219,6 @@ void CSaomashouyinPageUI::XianshiYouhui()
 	UpdateJiesuanZhifuPos();
 }
 
-void CSaomashouyinPageUI::HandleDiandanAIShibieResult()
-{
-	
-}
-
-void CSaomashouyinPageUI::HandleChengzhongValueChange()
-{
-	std::string weight = CChengzhongWorker::GetInstance()->GetWeight();
-
-	CControlUI* pWendingStatus = static_cast<CControlUI*>(this->FindSubControl(_T("saomashouyin_page_status_chengzhong_wending")));
-	if (CChengzhongWorker::GetInstance()->GetIsWending() == true)
-	{
-		pWendingStatus->SetBkImage(L"deng_on.png");
-	}
-	else
-	{
-		pWendingStatus->SetBkImage(L"deng_off.png");
-	}
-
-	CLabelUI* pLabel = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_page_label_chengzhong_value")));
-	pLabel->SetText(CLewaimaiString::UTF8ToUnicode(weight).c_str());
-}
-
 void CSaomashouyinPageUI::ClickAixuexi()
 {
 	this->m_pMainWnd->SwitchPage(CMainWnd::AIXUEXI);

zhipuzi_pos_windows/page/CSaomashouyinPageUI.h

@@ -181,12 +181,6 @@ private:
 	//用于支付完成后，获取用于打印的order
 	CDiandanOrder GetPrintOrderinfo(std::string take_food_code, std::string show_trade_no, std::string shoukuan_type, std::string balance, std::string member_number);
 
-	//处理AI识别结果
-	void HandleDiandanAIShibieResult();
-
-	//处理称重数值变化
-	void HandleChengzhongValueChange();
-
 	//点击置零按钮
 	void ZhiLing();