Skip to content

F
fmp_takeout
Commit 6fd046c5 by yunpeng.song
Options

写销售写先插入一条记录

parent 0f065311
Showing with 20 additions and 18 deletions
Thread/workThread/flowcontroll.cpp
...@@ -228,15 +228,17 @@ bool flowControll::_PullOrder() ...@@ -228,15 +228,17 @@ bool flowControll::_PullOrder()
int new_orderid=_GetTableVID(orderObject); int new_orderid=_GetTableVID(orderObject);
emit changeOrderStatus(orderObject,new_orderid); emit changeOrderStatus(orderObject,new_orderid);
GetChannelName(orderObject); GetChannelName(orderObject);
if(!SelectOrderId(orderObject)) if(!Orderstatus::getInstance().isorderexit(orderObject->order_id))
{ Orderstatus::getInstance().statusinsert(orderObject->order_id,0,0);
saveSqlite(orderObject); // if(!SelectOrderId(orderObject))
if(orderObject->status != 1) // {
{ // saveSqlite(orderObject);
DoSalesSlip(orderObject,0); //写销售单 // if(orderObject->status != 1)
} // {
// emit sgnNewIdPrint(orderObject,new_orderid); //新订单打印 // DoSalesSlip(orderObject,0); //写销售单
} // }
// // emit sgnNewIdPrint(orderObject,new_orderid); //新订单打印
// }
} }
else else
{ {
...@@ -248,19 +250,19 @@ bool flowControll::_PullOrder() ...@@ -248,19 +250,19 @@ bool flowControll::_PullOrder()
.arg(_GetJsonStr(jsonObject)); .arg(_GetJsonStr(jsonObject));
if(oldStatus != orderObject->status) if(oldStatus != orderObject->status)
{ {
if(orderObject->status == 2) // if(orderObject->status == 2)
{ // {
DoSalesSlip(orderObject,0); //写销售单 // DoSalesSlip(orderObject,0); //写销售单
} // }
if(orderObject->status == 3 || orderObject->status ==30) // if(orderObject->status == 3 || orderObject->status ==30)
{ // {
RefuseSalesSlip(orderObject); // RefuseSalesSlip(orderObject);
} // }
emit changeOrderStatus(orderObject,oldStatus); emit changeOrderStatus(orderObject,oldStatus);
} }
} }
_EntryOrder(orderObject);
m_timestamp = orderObject->timestamp; m_timestamp = orderObject->timestamp;
} }
syncTime = recvJson[JSON_SYNCTIME].toInt()*1000; syncTime = recvJson[JSON_SYNCTIME].toInt()*1000;
......
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