Skip to content

F
fmtakeout
Commit 9dd8b231 by 李定达
Options

1.修改版本号

parent 3b00463b
Showing with 88 additions and 21 deletions
fmPrinter/fmPrinter.cpp
......@@ -45,6 +45,10 @@ FmPrinter::FmPrinter()
qDebug() << "Load Successful";
m_b_load_sucfl=true;
}
else{
qDebug()<<"load failed";
}
qDebug() << "sssb" << m_print_lib.isLoaded();
}
......@@ -209,17 +213,17 @@ bool FmPrinter::_RawDataToPrinter(QString printerName, QString data)
strcpy(temchar,tmpData.data());
if(!f_LaodAddress())
{
qDebug() << "load address";
qDebug() << "load address-----";
return false;
}
f_InitPrinter(inichar);
if(!f_OpenPrinter())
{
qDebug() << "f_OpenPrinter";
qDebug() << "f_OpenPrinter---";
f_ClosePrinter();
return false;
}
qDebug() << "f_print---";
f_PrintText(temchar);
memset(temchar,0x0,sizeof(temchar));
f_ClosePrinter();
......
takeout/control/orderlocalizework.cpp
......@@ -12,10 +12,12 @@
OrderLocalizeWork::OrderLocalizeWork(QObject *parent) : QObject(parent)
{
//订单改变更新db
//订单状态改变更新db
FMApplication::subscibeEvent(this, PosEvent::s_change_order);
//订单改变删除db
FMApplication::subscibeEvent(this, PosEvent::s_delete_order);
//订单本地状态改变更新db
FMApplication::subscibeEvent(this, PosEvent::s_opt_change_order);
FMDataBase db(qApp->applicationDirPath() + "/" + DEFAULT_DBNAME);
......@@ -24,11 +26,12 @@ OrderLocalizeWork::OrderLocalizeWork(QObject *parent) : QObject(parent)
"int(1),reserved1 varchar(40),reserved2 varchar(40),reserved3 varchar(40),"
"reserved4 varchar(40),reserved5 varchar(40),order_change_time varchar(20))"), DEFAULT_DBFORM);
}
bool OrderLocalizeWork::event(QEvent *e)
{
if(e->type() == PosEvent::s_change_order)
if(e->type() == PosEvent::s_change_order || e->type() == PosEvent::s_opt_change_order)
{
QString orderid;
......@@ -39,11 +42,6 @@ bool OrderLocalizeWork::event(QEvent *e)
return true;
}
if(e->type() == PosEvent::s_order_location)
{
return true;
}
if(e->type() == PosEvent::s_delete_order)
{
QVariantMap value;
......
takeout/control/orderprintwork.cpp
#include "orderprintwork.h"
#include "orderprintwork.h"
#include "preDefine.h"
......@@ -10,6 +10,8 @@
#include "../fmPrinter/fmPrinter.h"
#include "QsLog.h"
orderprintwork::orderprintwork(QObject *parent) : QObject(parent)
{
//订阅订单本地化事件
......@@ -32,8 +34,12 @@ bool orderprintwork::event(QEvent *e)
PosOrderPool::GetOrderObject(map[EVENT_KEY_ORDERID].toString(), order, last_status);
QLOG_INFO() << "begin print ...";
if(FmPrinter::GetInstance().DoPrint(QString("takeout"), &order))
{
QLOG_INFO() << "print succcess";
QVariantMap map;
map.insert(EVENT_KEY_ORDERID, order.order_id);
......@@ -42,6 +48,11 @@ bool orderprintwork::event(QEvent *e)
POSTEVENTTYPE(PosEvent::s_location_orderpool,map,QVariantMap);
}
else
{
QLOG_INFO() << "print failed";
}
}
return true;
}
......
takeout/model/posorderpool.cpp
......@@ -23,6 +23,7 @@ PosOrderPool::PosOrderPool(QObject *parent) : QObject(parent)
{
FMApplication::subscibeEvent(this, PosEvent::s_inset_orderpool);
FMApplication::subscibeEvent(this, PosEvent::s_change_orderpool);
FMApplication::subscibeEvent(this, PosEvent::s_location_orderpool);
loadOrders();
......@@ -203,6 +204,16 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
DEFAULTPOSTEVENT(PosEvent::s_change_order, order.order_id);
if(order.status == FirmOrder)
{
QVariantMap map;
map.insert(EVENT_KEY_ORDERID, order.order_id);
map.insert(EVENT_KEY_MSG, DEFAULT_LOCATION_PRINT);
POSTEVENTTYPE(PosEvent::s_order_location, map, QVariantMap);
}
return true;
}
......@@ -227,6 +238,16 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
DEFAULTPOSTEVENT(PosEvent::s_change_order, order.order_id);
if(order.status == FirmOrder && info.order_print_status == 0)
{
QVariantMap map;
map.insert(EVENT_KEY_ORDERID, order.order_id);
map.insert(EVENT_KEY_MSG, DEFAULT_LOCATION_PRINT);
POSTEVENTTYPE(PosEvent::s_order_location, map, QVariantMap);
}
return true;
}
......@@ -271,6 +292,16 @@ bool PosOrderPool::TryChangeOrderStatus(QString key, int order_status, int refun
DEFAULTPOSTEVENT(PosEvent::s_change_order, key);
if(info.order_status == FirmOrder && info.order_print_status == 0)
{
QVariantMap map;
map.insert(EVENT_KEY_ORDERID, info.order_id);
map.insert(EVENT_KEY_MSG, DEFAULT_LOCATION_PRINT);
POSTEVENTTYPE(PosEvent::s_order_location, map, QVariantMap);
}
return true;
}
}
......@@ -365,8 +396,13 @@ bool PosOrderPool::TryChangeOrderPrintStatus(QString key, int order_print_status
Order_Info info = s_order_pool[key];
info.order_print_status = order_print_status;
if(info.order_print_status != order_print_status && order_print_status > info.order_print_status)
{
info.order_print_status = order_print_status;
s_order_pool.insert(key, info);
DEFAULTPOSTEVENT(PosEvent::s_opt_change_order, key);
}
return true;
}
......
takeout/takeout.pro
......@@ -93,7 +93,7 @@ HEADERS += \
control/orderlocalizework.h \
control/orderprintwork.h
DISTFILES +=
DISTFILES += takeout.rc
FORMS += \
view/alertForm.ui \
......
takeout/view/detailForm.cpp
......@@ -59,13 +59,30 @@ void DetailForm::InitData(OrderObject *orderObject)
for(int i=0; i<orderObject->proList.count(); i++)
{
ui->detailTable0->insertRow(i);
ui->detailTable0->setItem(i, 0, new QTableWidgetItem(orderObject->proList.at(i)->name)); // 商品名
ui->detailTable0->item(i, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->price/100.0))); // 价格
ui->detailTable0->item(i, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(i, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量
ui->detailTable0->item(i, 2)->setTextAlignment(Qt::AlignCenter);
ProductObject *product = orderObject->proList.at(i);
ui->detailTable0->insertRow(0);
QString name = product->name , property_tags=product->property_tags;
if(!property_tags.isEmpty())
{
//<font color='#ff0000'>未登录</font>
QTableWidgetItem *item = new QTableWidgetItem(property_tags);
item->setTextColor(QColor(255,0,0));
//name.append(QString::fromLocal8Bit("\r\n加料：")).append(QString(property_tags.replace(",", "\r\n")));
ui->detailTable0->setItem(0, 0, item); // 商品名
//setTextColor(QColor(255,0,0)
ui->detailTable0->item(0, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(0, 1, new QTableWidgetItem(QString())); // 价格
ui->detailTable0->item(0, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(0, 2, new QTableWidgetItem(QString())); // 数量
ui->detailTable0->item(0, 2)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->insertRow(0);
}
ui->detailTable0->setItem(0, 0, new QTableWidgetItem(name)); // 商品名
ui->detailTable0->item(0, 0)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(0, 1, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->price/100.0))); // 价格
ui->detailTable0->item(0, 1)->setTextAlignment(Qt::AlignCenter);
ui->detailTable0->setItem(0, 2, new QTableWidgetItem(QString::number(orderObject->proList.at(i)->product_amount))); // 数量
ui->detailTable0->item(0, 2)->setTextAlignment(Qt::AlignCenter);
}
QString records;
......
takeout/view/floatForm.cpp
......@@ -61,7 +61,8 @@ bool FloatForm::event(QEvent *e)
if(!PosOrderPool::GetOrderStatus(orderid, orderstatus, lastorderstatus))
return true;
if(orderstatus == NewOrder || orderstatus == FirmOrder)
if((orderstatus == NewOrder && lastorderstatus == DefaultOrder) ||
(orderstatus == FirmOrder && lastorderstatus == DefaultOrder))
{
onStartRemind(0);
return true;
......
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