Commit 2d450c38 by ss.dai

销售单部分修改

parent d55e85f5
...@@ -28,6 +28,11 @@ public: ...@@ -28,6 +28,11 @@ public:
* 返回:是否成功 * 返回:是否成功
* */ * */
bool RefundOrder(const QString& orderId, QString& error); bool RefundOrder(const QString& orderId, QString& error);
/* 功能:获取写入销售单数据
* 参数:[1]订单对象
* 返回:写入销售单数据
* */
QByteArray _GetOrderEntryData(OrderObject const *orderObject, bool bVerify = false);
private: private:
FmPlugin(){} FmPlugin(){}
...@@ -45,11 +50,6 @@ private: ...@@ -45,11 +50,6 @@ private:
* 参数:[1]订单对象 * 参数:[1]订单对象
* 返回:写入销售单数据 * 返回:写入销售单数据
* */ * */
QByteArray _GetOrderEntryData(OrderObject const *orderObject, bool bVerify = false);
/* 功能:获取写入销售单数据
* 参数:[1]订单对象
* 返回:写入销售单数据
* */
QByteArray _GetRefundOrderData(const QString& orderId); QByteArray _GetRefundOrderData(const QString& orderId);
}; };
......
...@@ -263,8 +263,9 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del ...@@ -263,8 +263,9 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
OrderObject *orderObject = m_ordersMap.value(orderId); OrderObject *orderObject = m_ordersMap.value(orderId);
emit showAlert(AlertForm::LOADING, "正在写入销售单......"); emit showAlert(AlertForm::LOADING, "正在写入销售单......");
// 写入销售单 写入销售单
QLOG_INFO() << QString("[---begin entry order---]."); QLOG_INFO() << QString("[---begin entry order [%1]---].").arg(QString(FmPlugin::GetInstance()._GetOrderEntryData(orderObject)));
if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error)) if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error))
{ {
while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true)) while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, 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