Skip to content

F
fmtakeout
Commit a7dcb97e by 李定达
Options

1.修复排序bug;2.修复订单详情展示问题;3.修复扫码取餐隐藏bug;4.区分自提和外卖扫码取餐

parent 1780899e
Showing with 105 additions and 13 deletions
takeout/base/Print/newprintlib.cpp
......@@ -171,6 +171,7 @@ void NewPrintLib::PrintProcudt(const QList<LineNode*> &list,const QList<int>& pr
des.create_time = src->create_time; \
des.order_index = src->order_index; \
des.order_id = src->order_id; \
des.store_name = src->store_name; \
}while(0);
bool NewPrintLib::GetObjList(int page_depart, int prod_depart, QStringList prodlist, QList<OrderObject> &orderlist, OrderObject *order)
......
takeout/control/networkcheckwork.cpp
......@@ -10,6 +10,7 @@
NetworkCheckWork::NetworkCheckWork(WorkObject *parent) : WorkObject(parent)
{
_status = true;
_flag = true;
QString filename = qApp->applicationDirPath() + "/" + CONFIG_NAME;
_checkIP = QSettings(filename, QSettings::IniFormat).value(CONFIG_CHECKIP_IP).toString();
......@@ -64,10 +65,14 @@ void NetworkCheckWork::workstart()
QLOG_DEBUG() << "flag : " << flag;
QLOG_DEBUG() << "index : " << index;
//如果当前状态不等于网络状态推送信息
if(_status != status)
{
_status = status;
QVariantMap map;
map.insert(EVENT_KEY_NETWORKSTATUS, status);
POSTEVENTTYPE(PosEvent::s_network_outtime,map,QVariantMap);
}
if(_stopflag) {
break;
......
takeout/control/networkcheckwork.h
......@@ -20,6 +20,8 @@ private:
QString _checkIP;
int _checkNum;
//上一次的网络状态
bool _status;
};
#endif // NETWORKCHECKWORK_H
takeout/control/orderprintwork.cpp
......@@ -102,6 +102,8 @@ bool orderprintwork::GetPrtTemplet(int prttype, int pagew, QString &context, con
{
QFile file;
QLOG_DEBUG() << "prttype:" << prttype;
if(prttype == 0)
{
if(pagew > 56)
......@@ -307,7 +309,7 @@ void orderprintwork::DoBackPrint(const QString &prtname, const QString &orderid,
if(page == 0)
page = 56;
if(!GetPrtTemplet(0, page, context, order))
if(!GetPrtTemplet(2, page, context, order))
{
QLOG_ERROR() << "orderprintwork::DoBackPrint::GetPrtTemplet failed";
return ;
......
takeout/preDefine.h
......@@ -247,7 +247,7 @@
// 订单操作名
#define OPERATIONNAME_GETDELIVERS "接单"
#define OPERATIONNAME_REFUSE "拒单"
#define OPERATIONNAME_MAKEOVER "制作完成"
#define OPERATIONNAME_MAKEOVER "做完"
#define OPERATIONNAME_SENDOUT "送出"
#define OPERATIONNAME_COMPLETE "完成"
#define OPERATIONNAME_REFUSEREFUND "拒绝"
......
takeout/view/floatForm.cpp
......@@ -379,7 +379,7 @@ void FloatForm::_Blink()
void FloatForm::_PlayWav()
{
// if(m_play_flag == false && m_bReminding == true)
//if(m_play_flag == false && m_bReminding == true)
QSound::play(m_remindWav);
if(m_bReminding)
{
......
takeout/view/mainbtn.cpp
......@@ -39,7 +39,7 @@ void MainBtn::setChecked(bool check)
}
else
{
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(54,60,66,1)}");
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(125,139,153,1)}");
ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:orders_off.png)}");
}
return ;
......@@ -55,7 +55,7 @@ void MainBtn::setChecked(bool check)
}
else
{
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(54,60,66,1)}");
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(125,139,153,1)}");
ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:refund_off.png)}");
}
return ;
......@@ -71,7 +71,7 @@ void MainBtn::setChecked(bool check)
}
else
{
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(54,60,66,1)}");
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(125,139,153,1)}");
ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:setting_off.png)}");
}
return ;
......@@ -91,7 +91,7 @@ void MainBtn::setChecked(bool check)
}
else
{
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(54,60,66,1)}");
ui->mainbtnlabel_name->setStyleSheet("#mainbtnlabel_name{color:rgba(125,139,153,1)}");
ui->mainbtnlabel_lg->setStyleSheet("#mainbtnlabel_lg{ border-image: url(:scan_off.png)}");
}
return ;
......
takeout/view/newdetailform.cpp
......@@ -42,18 +42,69 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
// 初始化界面
ui->orderInfoLb_dec->setText(QString::fromLocal8Bit("【<font color=red>%1</font>】【%2】").arg(orderObject->channel_name,
orderObject->order_id));
if(!orderObject->remark.isEmpty())
{
ui->orderMemoLb_dec->setText(QString::fromLocal8Bit("【%1】").arg(orderObject->remark));
ui->orderMemoLb_dec->adjustSize();
}
else
{
ui->orderMemoLb_dec->clear();
}
ui->customerInfoLb_dec->setText(QString::fromLocal8Bit("【%1】【<font color=red>%2</font>】").arg(orderObject->customer,
orderObject->phone));
ui->addressLb_dec->setText(QString::fromLocal8Bit("【%1】【%2】").arg(orderObject->address,orderObject->address));
if(!orderObject->address.isEmpty())
{
ui->addressLb_dec->setText(QString::fromLocal8Bit("【%1】").arg(orderObject->address));
ui->addressLb_dec->adjustSize();
}
else
{
ui->addressLb_dec->clear();
}
QDateTime dTime = QDateTime::fromTime_t(orderObject->delivery_time);
QString timeStr = dTime.toString(QString::fromLocal8Bit("yyyy-MM-dd hh:mm"));
//QString timeStr = dTime.toString(QString::fromLocal8Bit("yyyy-MM-dd hh:mm"));
QString timeStr = dTime.toString(QString::fromLocal8Bit("hh:mm"));
if(QString("saas").compare(orderObject->channel, Qt::CaseInsensitive) == 0)
{
int type = orderObject->order_type;
if(type == AppointmentTakeout || type == AppointmentDining || type == AppointmentInvite)
{
if(type == AppointmentTakeout)
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【外卖】【<font color=red>预约</font>】【%1】").arg(timeStr));
else
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【自提】【<font color=red>预约</font>】【%1】").arg(timeStr));
}
else
{
if(type == TimelyTakeout)
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【外卖】【%1】").arg(timeStr));
else
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【自提】【%1】").arg(timeStr));
}
}
else
{
int type = orderObject->order_type;
if(type == AppointmentTakeout || type == AppointmentDining || type == AppointmentInvite)
{
if(type == AppointmentTakeout)
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【%1】【<font color=red>预约</font>】【%2】").arg(orderObject->delivery_party,timeStr));
else
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【%1】【<font color=red>预约</font>】【%2】").arg(orderObject->delivery_party,timeStr));
}
else
{
ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【%1】【%2】").arg(orderObject->delivery_party,timeStr));
}
}
//ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【%1】【%2】").arg(orderObject->delivery_party,timeStr));
QList<DiscountObject *> list = orderObject->disList;
QString disStr;
......
takeout/view/newmainform.cpp
......@@ -751,7 +751,9 @@ void NewMainForm::SetChecked(QPushButton *btn)
{
_curr_check_btn = btn;
var->setChecked(true);
ui->newmaintablewidget_order->setSortingEnabled(false);
ClassifyOrder(_curr_check_btn->property("type").toString());
ui->newmaintablewidget_order->setSortingEnabled(true);
//qDebug() << "------" << _curr_page_num;
......@@ -779,8 +781,10 @@ void NewMainForm::UpdateTableWidget(OrderObject &orderObject)
break;
}
}
ui->newmaintablewidget_order->setSortingEnabled(false);
ClassifyOrder(_curr_check_btn->property("type").toString());
ui->newmaintablewidget_order->setSortingEnabled(true);
}
void NewMainForm::DeleteTableWidget(QString orderid)
......@@ -797,7 +801,10 @@ void NewMainForm::DeleteTableWidget(QString orderid)
}
}
ui->newmaintablewidget_order->setSortingEnabled(false);
ClassifyOrder(_curr_check_btn->property("type").toString());
ui->newmaintablewidget_order->setSortingEnabled(true);
}
void NewMainForm::MyShow()
......@@ -845,7 +852,9 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
{
QTableWidget *table = ui->newmaintablewidget_order;
table->insertRow(0);
QTableWidgetItem *item = new QTableWidgetItem(QString::number(orderObject.order_index));
//QTableWidgetItem *item = new QTableWidgetItem(QString::number(orderObject.order_index));
QTableWidgetItem *item = new QTableWidgetItem();
item->setData(Qt::DisplayRole, orderObject.order_index);
item->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 0, item); //序号
......@@ -887,7 +896,10 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
//qDebug() << _curr_check_btn->property("type").toString();
ui->newmaintablewidget_order->setSortingEnabled(false);
ClassifyOrder(_curr_check_btn->property("type").toString());
ui->newmaintablewidget_order->setSortingEnabled(true);
table->setRowHeight(0, 36);
}
......
takeout/view/newpickupform.cpp
......@@ -71,9 +71,28 @@ void NewPickupForm::findOrder()
return ;
}
this->hide();
OrderObject order;
if(PosOrderPool::GetOrderObject(ui->newpickupline_code->text(), order))
{
if(order.order_type == TimelyTakeout || order.order_type == AppointmentTakeout)
{
//this->hide();
emit showOrderInfo(ui->newpickupline_code->text(), false);
}
else
{
//this->hide();
emit showOrderInfo(ui->newpickupline_code->text(), true);
}
return ;
}
ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE8\x8E\xB7\xE5\x8F\x96\xE8\xAE\xA2\xE5\x8D\x95\xE5\xA4\xB1\xE8\xB4\xA5"));
return ;
}
else
{
QLOG_DEBUG() << "*****************:" << status << refund_status;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment