Skip to content

F
fmtakeout
Commit 840b9052 by xiaoqing.gu
Options

1、后厨打印添加属性字段 2、优化未登录退出不干净的bug 3、优化交接班打印（点击打印按钮后时间更新，下次打印开始时间缓存更新）

parent 756f75c9
Showing with 178 additions and 148 deletions
takeout/base/Print/newprintlib.cpp
......@@ -187,6 +187,9 @@ void NewPrintLib::AddProdJson(OrderObject &des_order, ProductObject* prod)
object["price"] = prod->price;
object["name"] = prod->name;
object["product_amount"] = prod->product_amount;
//加入属性字段
object["property_tags"] = prod->property_tags;
array.append(object);
des_order._orderObject["products"] = array;
......@@ -306,6 +309,13 @@ bool NewPrintLib::DoPrint(const QString &config, const QString &context, OrderOb
QLOG_DEBUG() << "NewPrintLib::type:" << type;
//桌号设置
if(orderObj.contains("table_number") && orderObj["table_number"].toString() != "")
{
QLOG_DEBUG() << "NewPrintLib::table_number:" << orderObj["table_number"].toString();
tmporder._orderObject["table_number"] = QString(orderObj["table_number"].toString() + QString::fromLocal8Bit(TABLE_NUMBER));
QLOG_DEBUG() << "NewPrintLib::new_table_number:" << tmporder._orderObject["table_number"].toString();
}
//表头设置
QString channel = orderObj["channel"].toString();
......@@ -674,6 +684,14 @@ bool NewPrintLib::DoBackPrint(int page_depart, int prod_depart, int page_num, co
QLOG_DEBUG() << "NewPrintLib::type:" << type;
//桌号设置
if(orderObj.contains("table_number") && orderObj["table_number"].toString() != "")
{
QLOG_DEBUG() << "NewPrintLib::table_number:" << orderObj["table_number"].toString();
tmporder._orderObject["table_number"] = QString(orderObj["table_number"].toString() + QString::fromLocal8Bit(TABLE_NUMBER));
QLOG_DEBUG() << "NewPrintLib::new_table_number:" << tmporder._orderObject["table_number"].toString();
}
QString channel = orderObj["channel"].toString();
QLOG_DEBUG() << "NewPrintLib::channel:" << channel;
......
takeout/control/driverinfogetwork.cpp
......@@ -8,7 +8,6 @@
DriverInfoGetWork::DriverInfoGetWork(WorkObject *parent) : WorkObject(parent)
{
_islogin = false;
FMApplication::subscibeEvent(this, PosEvent::s_get_order_status);
FMApplication::subscibeEvent(this, PosEvent::s_token_change);
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
......@@ -69,8 +68,6 @@ bool DriverInfoGetWork::event(QEvent *e)
_storeinfo = storeinfo;
_islogin = true;
return true;
}
......@@ -99,12 +96,20 @@ void DriverInfoGetWork::workstart()
}
//加入登陆标志位，防止未登录线程启动后阻塞，导致未登录退出阻塞
if(_islogin)
{
QEventLoop loop;
connect(this, &DriverInfoGetWork::quitGetWork, &loop, &QEventLoop::quit);
loop.exec();
}
// if(_islogin)
// {
// QEventLoop loop;
// connect(this, &DriverInfoGetWork::quitGetWork, &loop, &QEventLoop::quit);
// connect(this, &DriverInfoGetWork::quit, &loop, &QEventLoop::quit);
// loop.exec();
// }
QEventLoop loop;
connect(this, &DriverInfoGetWork::quitGetWork, &loop, &QEventLoop::quit);
connect(this, &DriverInfoGetWork::quit, &loop, &QEventLoop::quit);
loop.exec();
QLOG_DEBUG() << "DriverInfoGetWork::workstart loop start";
......
takeout/control/driverinfogetwork.h
......@@ -45,8 +45,6 @@ private:
QString _url;
bool _islogin;
};
class GetDriverInfoDataProcess
......
takeout/preDefine.h
......@@ -272,6 +272,7 @@
#define ORDER_TYPE_TIMELYINVITE "小程序自提"
#define ORDER_TYPE_APPOINTMENTTAKEOUT "小程序外卖预约"
#define ORDER_TYPE_APPOINTMENTINVITE "小程序自提预约"
#define TABLE_NUMBER "桌"
#define ORDER_THIRD_TIMELYTAKEOUT "外卖"
#define ORDER_THIRD_TIMELYINVITE "自提"
......
takeout/takeout.pro
......@@ -27,150 +27,151 @@ DEFINES += FM_NEW_UI
#DEFINES += FM_TEST
#DEFINES += FM_MAIN_TEST
#DEFINES += FM_ORDER_TEST
RC_FILE += takeout.rc
RC_FILE += $$PWD/takeout.rc
CONFIG += c++11
SOURCES += main.cpp \
event/fmapplication.cpp \
event/posevent.cpp \
model/baseObject.cpp \
model/cashierObject.cpp \
model/deliverObject.cpp \
model/orderObject.cpp \
model/posorderpool.cpp \
model/productObject.cpp \
base/Network/billSocket.cpp \
control/orderpushwork.cpp \
base/Config/configManger.cpp \
view/alertForm.cpp \
view/floatForm.cpp \
view/mainForm.cpp \
view/padForm.cpp \
view/pickForm.cpp \
view/RejectForm.cpp \
view/settingForm.cpp \
control/ordergetwork.cpp \
view/sysTray.cpp \
view/clickedLineEdit.cpp \
view/headframe.cpp \
view/detailForm.cpp \
base/Arithmetic/util.cpp \
base/DB/fm_database.cpp \
control/orderlocalizework.cpp \
control/orderprintwork.cpp \
view/loginform.cpp \
model/discountObject.cpp \
view/prtsettingform.cpp \
control/workobject.cpp \
view/pickupform.cpp \
control/pickuporderwork.cpp \
view/newmainform.cpp \
view/ordertypeform.cpp \
view/orderoptform.cpp \
view/mainbtn.cpp \
view/newdetailform.cpp \
control/prtlocalizework.cpp \
model/posprtpool.cpp \
control/stallsgetwork.cpp \
model/posstallspool.cpp \
view/prttypeform.cpp \
view/newloginform.cpp \
view/newpickupform.cpp \
base/Network/ping.cpp \
control/networkcheckwork.cpp \
base/System/downloader.cpp \
control/prtmodelgetwork.cpp \
model/prtmodelpool.cpp \
view/newchangeshiftsform.cpp \
base/Arithmetic/cretopt.cpp \
control/driverinfogetwork.cpp \
view/newfloatform.cpp
SOURCES +=
$$PWD/main.cpp \
$$PWD/event/fmapplication.cpp \
$$PWD/event/posevent.cpp \
$$PWD/model/baseObject.cpp \
$$PWD/model/cashierObject.cpp \
$$PWD/model/deliverObject.cpp \
$$PWD/model/orderObject.cpp \
$$PWD/model/posorderpool.cpp \
$$PWD/model/productObject.cpp \
$$PWD/base/Network/billSocket.cpp \
$$PWD/control/orderpushwork.cpp \
$$PWD/base/Config/configManger.cpp \
$$PWD/view/alertForm.cpp \
$$PWD/view/floatForm.cpp \
$$PWD/view/mainForm.cpp \
$$PWD/view/padForm.cpp \
$$PWD/view/pickForm.cpp \
$$PWD/view/RejectForm.cpp \
$$PWD/view/settingForm.cpp \
$$PWD/control/ordergetwork.cpp \
$$PWD/view/sysTray.cpp \
$$PWD/view/clickedLineEdit.cpp \
$$PWD/view/headframe.cpp \
$$PWD/view/detailForm.cpp \
$$PWD/base/Arithmetic/util.cpp \
$$PWD/base/DB/fm_database.cpp \
$$PWD/control/orderlocalizework.cpp \
$$PWD/control/orderprintwork.cpp \
$$PWD/view/loginform.cpp \
$$PWD/model/discountObject.cpp \
$$PWD/view/prtsettingform.cpp \
$$PWD/control/workobject.cpp \
$$PWD/view/pickupform.cpp \
$$PWD/control/pickuporderwork.cpp \
$$PWD/view/newmainform.cpp \
$$PWD/view/ordertypeform.cpp \
$$PWD/view/orderoptform.cpp \
$$PWD/view/mainbtn.cpp \
$$PWD/view/newdetailform.cpp \
$$PWD/control/prtlocalizework.cpp \
$$PWD/model/posprtpool.cpp \
$$PWD/control/stallsgetwork.cpp \
$$PWD/model/posstallspool.cpp \
$$PWD/view/prttypeform.cpp \
$$PWD/view/newloginform.cpp \
$$PWD/view/newpickupform.cpp \
$$PWD/base/Network/ping.cpp \
$$PWD/control/networkcheckwork.cpp \
$$PWD/base/System/downloader.cpp \
$$PWD/control/prtmodelgetwork.cpp \
$$PWD/model/prtmodelpool.cpp \
$$PWD/view/newchangeshiftsform.cpp \
$$PWD/base/Arithmetic/cretopt.cpp \
$$PWD/control/driverinfogetwork.cpp \
$$PWD/view/newfloatform.cpp
HEADERS += \
event/fmapplication.h \
event/posevent.h \
model/baseObject.h \
model/cashierObject.h \
model/deliverObject.h \
model/orderObject.h \
model/posorderpool.h \
model/productObject.h \
base/Network/billSocket.h \
base/Dump/dump.h \
preDefine.h \
control/orderpushwork.h \
base/Config/configManger.h \
view/alertForm.h \
view/floatForm.h \
view/mainForm.h \
view/padForm.h \
view/pickForm.h \
view/RejectForm.h \
view/settingForm.h \
control/ordergetwork.h \
base/Arithmetic/cretopt.h \
base/Arithmetic/dataprocess.h \
view/sysTray.h \
view/clickedLineEdit.h \
view/headframe.h \
view/detailForm.h \
base/Arithmetic/util.h \
base/DB/fm_database.h \
control/orderlocalizework.h \
control/orderprintwork.h \
view/loginform.h \
model/discountObject.h \
view/prtsettingform.h \
base/System/GetPrinters.h \
control/workobject.h \
view/pickupform.h \
control/pickuporderwork.h \
view/newmainform.h \
view/ordertypeform.h \
view/orderoptform.h \
view/mainbtn.h \
view/newdetailform.h \
control/prtlocalizework.h \
model/posprtpool.h \
control/stallsgetwork.h \
model/posstallspool.h \
view/prttypeform.h \
view/newloginform.h \
view/newpickupform.h \
base/Network/ping.h \
control/networkcheckwork.h \
base/System/downloader.h \
control/prtmodelgetwork.h \
model/prtmodelpool.h \
view/newchangeshiftsform.h \
control/driverinfogetwork.h \
view/newfloatform.h
$$PWD/event/fmapplication.h \
$$PWD/event/posevent.h \
$$PWD/model/baseObject.h \
$$PWD/model/cashierObject.h \
$$PWD/model/deliverObject.h \
$$PWD/model/orderObject.h \
$$PWD/model/posorderpool.h \
$$PWD/model/productObject.h \
$$PWD/base/Network/billSocket.h \
$$PWD/base/Dump/dump.h \
$$PWD/preDefine.h \
$$PWD/control/orderpushwork.h \
$$PWD/base/Config/configManger.h \
$$PWD/view/alertForm.h \
$$PWD/view/floatForm.h \
$$PWD/view/mainForm.h \
$$PWD/view/padForm.h \
$$PWD/view/pickForm.h \
$$PWD/view/RejectForm.h \
$$PWD/view/settingForm.h \
$$PWD/control/ordergetwork.h \
$$PWD/base/Arithmetic/cretopt.h \
$$PWD/base/Arithmetic/dataprocess.h \
$$PWD/view/sysTray.h \
$$PWD/view/clickedLineEdit.h \
$$PWD/view/headframe.h \
$$PWD/view/detailForm.h \
$$PWD/base/Arithmetic/util.h \
$$PWD/base/DB/fm_database.h \
$$PWD/control/orderlocalizework.h \
$$PWD/control/orderprintwork.h \
$$PWD/view/loginform.h \
$$PWD/model/discountObject.h \
$$PWD/view/prtsettingform.h \
$$PWD/base/System/GetPrinters.h \
$$PWD/control/workobject.h \
$$PWD/view/pickupform.h \
$$PWD/control/pickuporderwork.h \
$$PWD/view/newmainform.h \
$$PWD/view/ordertypeform.h \
$$PWD/view/orderoptform.h \
$$PWD/view/mainbtn.h \
$$PWD/view/newdetailform.h \
$$PWD/control/prtlocalizework.h \
$$PWD/model/posprtpool.h \
$$PWD/control/stallsgetwork.h \
$$PWD/model/posstallspool.h \
$$PWD/view/prttypeform.h \
$$PWD/view/newloginform.h \
$$PWD/view/newpickupform.h \
$$PWD/base/Network/ping.h \
$$PWD/control/networkcheckwork.h \
$$PWD/base/System/downloader.h \
$$PWD/control/prtmodelgetwork.h \
$$PWD/model/prtmodelpool.h \
$$PWD/view/newchangeshiftsform.h \
$$PWD/control/driverinfogetwork.h \
$$PWD/view/newfloatform.h
DISTFILES += takeout.rc
DISTFILES += $$PWD/takeout.rc
FORMS += \
view/alertForm.ui \
view/floatForm.ui \
view/mainForm.ui \
view/padForm.ui \
view/pickForm.ui \
view/RejectForm.ui \
view/settingForm.ui \
view/detailForm.ui \
view/loginform.ui \
view/prtsettingform.ui \
view/pickupform.ui \
view/newmainform.ui \
view/ordertypeform.ui \
view/orderoptform.ui \
view/mainbtn.ui \
view/newdetailform.ui \
view/prttypeform.ui \
view/newpickupform.ui \
view/newchangeshiftsform.ui \
view/newfloatform.ui \
view/newloginform.ui
$$PWD/view/alertForm.ui \
$$PWD/view/floatForm.ui \
$$PWD/view/mainForm.ui \
$$PWD/view/padForm.ui \
$$PWD/view/pickForm.ui \
$$PWD/view/RejectForm.ui \
$$PWD/view/settingForm.ui \
$$PWD/view/detailForm.ui \
$$PWD/view/loginform.ui \
$$PWD/view/prtsettingform.ui \
$$PWD/view/pickupform.ui \
$$PWD/view/newmainform.ui \
$$PWD/view/ordertypeform.ui \
$$PWD/view/orderoptform.ui \
$$PWD/view/mainbtn.ui \
$$PWD/view/newdetailform.ui \
$$PWD/view/prttypeform.ui \
$$PWD/view/newpickupform.ui \
$$PWD/view/newchangeshiftsform.ui \
$$PWD/view/newfloatform.ui \
$$PWD/view/newloginform.ui
CONFIG(release, debug|release){
QMAKE_LFLAGS += /DEBUG
......
takeout/view/newchangeshiftsform.cpp
......@@ -76,7 +76,7 @@ void NewChangeShiftsForm::Initshow()
QString date = loginTime.section(" ",0,0);
if(date != QDateTime::currentDateTime().toString("yyyy-MM-dd")) {
configIni->setValue("base/loginTime",QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm"));
configIni->setValue("base/loginTime",QString(QDateTime::currentDateTime().toString("yyyy-MM-dd") + QString(" 00:00")));
ui->label_shiftTime_str->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd") + QString(" 00:00"));
m_storeinfo[JSON_KEY_TIMESTAMP] = QString(QDateTime::currentDateTime().toString("yyyy-MM-dd") + QString(" 00:00"));
} else {
......@@ -321,6 +321,13 @@ void NewChangeShiftsForm::on_prtBtn_clicked()
QSettings *configIni = new QSettings(configfile, QSettings::IniFormat);
configIni->setValue("base/loginTime", dateTime);
//优化交接班打印，打印按钮点击之后，将下次打印开始时间置为当前时间
m_storeinfo[JSON_KEY_TIMESTAMP] = dateTime;
ui->label_shiftTime_str->setText(dateTime);
ui->label_timeTo_str->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm"));
}
return;
......
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