Commit ce44cc42 by ss.dai

a

parent 44a58903
...@@ -170,7 +170,6 @@ bool FlowControl::_PullOrder() ...@@ -170,7 +170,6 @@ bool FlowControl::_PullOrder()
emit changeOrderStatus(orderObject); emit changeOrderStatus(orderObject);
if(!Orderstatus::getInstance().isorderexit(orderId)) if(!Orderstatus::getInstance().isorderexit(orderId))
{ {
Orderstatus::getInstance().statusinsert(orderId,0); Orderstatus::getInstance().statusinsert(orderId,0);
...@@ -181,14 +180,19 @@ bool FlowControl::_PullOrder() ...@@ -181,14 +180,19 @@ bool FlowControl::_PullOrder()
QLOG_INFO()<<QString("[---begin to tip---]"); QLOG_INFO()<<QString("[---begin to tip---]");
// 打印 // 打印
QLOG_INFO() << QString("[---begin print---]"); QLOG_INFO() << QString("[---begin print---]");
if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject)) QSettings tmpIni(QString("%1/%2").arg(QApplication::applicationDirPath()).arg("printerConfig_tmp.ini"), QSettings::IniFormat);
{ int num = tmpIni.value(QString("%1/num").arg(orderObject->channel), 1).toInt();
QLOG_INFO() << QString("print sucessful"); for(int i=0; i<num; i++)
Orderstatus::getInstance().printupdate(orderId,1);
}else
{ {
emit showAlert(AlertForm::ERROR, QString("打印冲突,请稍后手动打印或重启收银程序")); if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject))
QLOG_INFO() << QString("print failed"); {
QLOG_INFO() << QString("print sucessful");
Orderstatus::getInstance().printupdate(orderId,1);
}else
{
emit showAlert(AlertForm::ERROR, QString("打印冲突,请稍后手动打印或重启收银程序"));
QLOG_INFO() << QString("print failed");
}
} }
} }
}else }else
......
[info]
num=2
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.0.0, 2017-04-10T18:15:59. --> <!-- Written by QtCreator 4.0.0, 2017-04-14T09:39:05. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
......
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