Skip to content

F
FmTakeaway
Commit f44452e9 by ss.dai
Options

1

parent f0e55aea
Showing with 86 additions and 12 deletions
fmPrinter/fmPrinter.cpp
......@@ -82,8 +82,8 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
}
}
print = str_print.arg(v).arg(pData->channelName).arg(pData->order_id).arg(pData->pay_type)
.arg(pData->customer).arg(pData->phone).arg(pData->address.replace("埇","Yong")).arg(str_comd_list)
print = str_print.arg(v).arg(QString("%1 #%2").arg(pData->channelName).arg(pData->order_index)).arg(pData->order_id).arg(pData->pay_type)
.arg(pData->customer).arg(pData->phone).arg(pData->address).arg(str_comd_list)
.arg(_Penny2Dollar(pData->total_fee-pData->send_fee)).arg(_Penny2Dollar(pData->discount_fee)).arg(_Penny2Dollar(pData->send_fee)).arg(pData->total_amount)
.arg(fee).arg(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm")).arg(pData->remark).arg(pData->courier_name).arg(pData->courier_phone)
.arg(pData->delivery_time==0? "立即送出" : QDateTime::fromTime_t(pData->delivery_time).toString("MM/dd hh:mm"));
......
fmTakeaway/Control/flowControl.cpp
......@@ -151,7 +151,25 @@ bool FlowControl::_PullOrder()
QLOG_INFO() << QString("new order[%1:%2].[data:%3]")
.arg(orderObject->order_id, orderObject->status_desc)
.arg(_GetJsonStr(jsonObject));
emit changeOrderStatus(orderObject);
// 订单完成状态再重新录一遍
bool bRed = false;
if(orderObject->status==6 || orderObject->status==200)
{
QLOG_INFO() << QString("[---begin entry order.finsh [%1]---].").arg(QString(FmPlugin::GetInstance()._GetOrderEntryData(orderObject)));
if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
{
QLOG_INFO() << QString("entry order failed.finsh[%1]").arg(error);
bRed = true;
}
else
{
QLOG_INFO() << QString("[entry order success.finsh].");
}
}
emit changeOrderStatus(orderObject, -100, bRed);
}else
{
//旧数据有更新
......@@ -161,9 +179,27 @@ bool FlowControl::_PullOrder()
QLOG_INFO() << QString("old order[%1:%2].[data:%3]")
.arg(orderObject->order_id, orderObject->status_desc)
.arg(_GetJsonStr(jsonObject));
// 订单完成状态再重新录一遍
bool bRed = false;
if(orderObject->status==6 || orderObject->status==200)
{
QLOG_INFO() << QString("[---begin entry order.finsh [%1]---].").arg(QString(FmPlugin::GetInstance()._GetOrderEntryData(orderObject)));
if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
{
QLOG_INFO() << QString("entry order failed.finsh[%1]").arg(error);
bRed = true;
}
else
{
QLOG_INFO() << QString("[entry order success.finsh].");
}
}
if(oldStatus != orderObject->status)
{
emit changeOrderStatus(orderObject, oldStatus);
emit changeOrderStatus(orderObject, oldStatus, bRed);
}
if(oldcourier!=orderObject->courier_name)
{
......@@ -181,10 +217,7 @@ bool FlowControl::_PullOrder()
if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error))
{
//while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
//{
QLOG_INFO() << QString("entry order failed[%1]").arg(error);
//}
}
else
{
......
fmTakeaway/Control/flowControl.h
......@@ -73,10 +73,10 @@ signals:
* */
void setNetStatus(const QString& status);
/* 功能:更改订单显示表
* 参数:[1]订单对象[2]旧订单的状态
* 参数:[1]订单对象[2]旧订单的状态[3]是否标红
* 返回:NULL
* */
void changeOrderStatus(OrderObject* orderObject, int oldStatus=-100);
void changeOrderStatus(OrderObject* orderObject, int oldStatus=-100, bool bRed=false);
/* 功能:显示配送员选择窗
* 参数:[1]订单编号[2]配送员信息
* 返回:NULL
......
fmTakeaway/detailForm.cpp
......@@ -5,6 +5,9 @@
#include "DTools/configManger.h"
#include "Control/flowControl.h"
#include "fmPrinter.h"
#include "QsLog.h"
#include "fmPlugin.h"
DetailForm::DetailForm(QWidget *parent) :
QDialog(parent),
......@@ -131,8 +134,31 @@ void DetailForm::onOperaBtnClicked()
void DetailForm::on_detailBtn1_clicked()
{
QLOG_INFO() << "re print...............";
if(!m_orderObject->courier_name.isEmpty())
{
QLOG_INFO() << "---------------------" << m_orderObject->courier_name;
FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), m_orderObject);
}
}
void DetailForm::on_detailBtn0_clicked()
{
//写入销售单
QString error;
QLOG_INFO() << QString("[---begin entry order [%1]---].").arg(QString(FmPlugin::GetInstance()._GetOrderEntryData(m_orderObject)));
if(!FmPlugin::GetInstance().DoOrderEntry(m_orderObject, error))
{
//while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
//{
QLOG_INFO() << QString("entry order failed[%1]").arg(error);
//}
}
else
{
QLOG_INFO() << QString("[entry order success].");
}
}
fmTakeaway/detailForm.h
......@@ -56,6 +56,12 @@ private slots:
* 返回:NULL
* */
void on_detailBtn1_clicked();
/* 功能:处理重新录单按钮点击
* 参数:NULL
* 返回:NULL
* */
void on_detailBtn0_clicked();
};
#endif // DETAILFORM_H
fmTakeaway/mainForm.cpp
......@@ -293,7 +293,7 @@ void MainForm::onSetNetStatus(const QString &status)
ui->mainLabNetStatus->setText(status);
}
void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool bRed)
{
_SetTablesSortEnable(false);
QTableWidget *table;
......@@ -318,7 +318,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
tabBtn = _GetTabBtnByOrderStatus(orderObject->status);
table = findChild<QTableWidget*>(tabBtn->property("tableName").toString());
table->insertRow(0);
QTableWidgetItem *item0 = new QTableWidgetItem(orderObject->channelName);
QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1#%2").arg(orderObject->channelName).arg(orderObject->order_index));
item0->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 0, item0); // 渠道
QTableWidgetItem *item1 = new QTableWidgetItem(orderObject->order_id);
......@@ -336,6 +336,15 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
QTableWidgetItem *item5 = new QTableWidgetItem(QDateTime::fromTime_t(orderObject->create_time).toString("MM-dd hh:mm"));
item5->setTextAlignment(Qt::AlignCenter);
table->setItem(0, 5, item5); // 下单时间
if(bRed)
{
item0->setTextColor(QColor("red"));
item1->setTextColor(QColor("red"));
item2->setTextColor(QColor("red"));
item3->setTextColor(QColor("red"));
item4->setTextColor(QColor("red"));
item5->setTextColor(QColor("red"));
}
if(table != ui->mainTableFinsh && table != ui->mainTableOther)
{
QWidget *pWdg = new QWidget(table);
......
fmTakeaway/mainForm.h
......@@ -214,7 +214,7 @@ public slots:
* 参数:[1]订单对象[2]旧订单的状态
* 返回:NULL
* */
void onChangeOrderStatus(OrderObject *orderObject, int oldStatus);
void onChangeOrderStatus(OrderObject *orderObject, int oldStatus, bool bRed);
/* 功能:显示配送员选择窗口
* 参数:[1]订单编号[2]配送员信息
* 返回:NULL
......
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