Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FmTakeaway
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shangshang.dai
FmTakeaway
Commits
2d450c38
Commit
2d450c38
authored
Sep 26, 2016
by
ss.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
销售单部分修改
parent
d55e85f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
fmPlugin/fmPlugin.h
+5
-5
fmTakeaway/Control/flowControl.cpp
+3
-2
No files found.
fmPlugin/fmPlugin.h
View file @
2d450c38
...
...
@@ -28,6 +28,11 @@ public:
* 返回:是否成功
* */
bool
RefundOrder
(
const
QString
&
orderId
,
QString
&
error
);
/* 功能:获取写入销售单数据
* 参数:[1]订单对象
* 返回:写入销售单数据
* */
QByteArray
_GetOrderEntryData
(
OrderObject
const
*
orderObject
,
bool
bVerify
=
false
);
private
:
FmPlugin
(){}
...
...
@@ -45,11 +50,6 @@ private:
* 参数:[1]订单对象
* 返回:写入销售单数据
* */
QByteArray
_GetOrderEntryData
(
OrderObject
const
*
orderObject
,
bool
bVerify
=
false
);
/* 功能:获取写入销售单数据
* 参数:[1]订单对象
* 返回:写入销售单数据
* */
QByteArray
_GetRefundOrderData
(
const
QString
&
orderId
);
};
...
...
fmTakeaway/Control/flowControl.cpp
View file @
2d450c38
...
...
@@ -263,8 +263,9 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
OrderObject
*
orderObject
=
m_ordersMap
.
value
(
orderId
);
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
))
{
while
(
!
FmPlugin
::
GetInstance
().
DoOrderEntry
(
orderObject
,
error
,
true
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment