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
d405e7b2
Commit
d405e7b2
authored
Mar 17, 2017
by
ss.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改销售单写入的时机(判断依据改为订单的配送状态)
parent
3c59dfb5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
2 deletions
+1
-2
fmTakeaway/Control/flowControl.cpp
+1
-2
No files found.
fmTakeaway/Control/flowControl.cpp
View file @
d405e7b2
...
...
@@ -176,7 +176,6 @@ bool FlowControl::_PullOrder()
{
//旧数据有更新
int
oldStatus
=
orderObject
->
status
;
QString
oldcourier
=
orderObject
->
courier_name
;
orderObject
->
FromJson
(
jsonObject
);
QLOG_INFO
()
<<
QString
(
"old order[%1:%2].[data:%3]"
)
.
arg
(
orderObject
->
order_id
,
orderObject
->
status_desc
)
...
...
@@ -203,7 +202,7 @@ bool FlowControl::_PullOrder()
{
emit
changeOrderStatus
(
orderObject
,
oldStatus
,
bRed
);
}
if
(
o
ldcourier
!=
orderObject
->
courier_name
)
if
(
o
rderObject
->
delivery_status
==
3
)
{
//写入销售单
QLOG_INFO
()
<<
QString
(
"[---begin entry order [%1]---]."
).
arg
(
QString
(
FmPlugin
::
GetInstance
().
_GetOrderEntryData
(
orderObject
)));
...
...
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