Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_takeout
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
zhenfei.zhang
fmp_takeout
Commits
591ea38f
Commit
591ea38f
authored
Jun 12, 2017
by
jackalone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加退单和修改接单后写销售单的逻辑
parent
06c80830
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
1 deletions
+68
-1
Thread/workThread/flowcontroll.cpp
+66
-1
Thread/workThread/flowcontroll.h
+2
-0
No files found.
Thread/workThread/flowcontroll.cpp
View file @
591ea38f
...
...
@@ -230,8 +230,11 @@ bool flowControll::_PullOrder()
if
(
!
SelectOrderId
(
orderObject
))
{
saveSqlite
(
orderObject
);
if
(
orderObject
->
status
!=
1
)
{
DoSalesSlip
(
orderObject
,
0
);
//写销售单
emit
sgnNewIdPrint
(
orderObject
,
new_orderid
);
}
// emit sgnNewIdPrint(orderObject,new_orderid); //新订单打印
}
}
else
...
...
@@ -244,6 +247,15 @@ bool flowControll::_PullOrder()
.
arg
(
_GetJsonStr
(
jsonObject
));
if
(
oldStatus
!=
orderObject
->
status
)
{
if
(
orderObject
->
status
==
2
)
{
DoSalesSlip
(
orderObject
,
0
);
//写销售单
}
if
(
orderObject
->
status
==
3
||
orderObject
->
status
==
30
)
{
RefuseSalesSlip
(
orderObject
);
}
emit
changeOrderStatus
(
orderObject
,
oldStatus
);
}
}
...
...
@@ -260,6 +272,18 @@ bool flowControll::_PullOrder()
return
result
;
}
QByteArray
flowControll
::
_GetOrderRefuseData
(
const
OrderObject
*
orderObject
)
{
QJsonObject
rObj
,
cObj
;
rObj
.
insert
(
"fm_cmd"
,
"refund_order"
);
rObj
.
insert
(
"fm_ver"
,
"1.0"
);
rObj
.
insert
(
"fm_id"
,
orderObject
->
fm_id
);
QJsonDocument
doc
(
rObj
);
return
doc
.
toJson
(
QJsonDocument
::
Compact
);
}
QByteArray
flowControll
::
_GetOrderEntryData
(
const
OrderObject
*
orderObject
,
bool
bVerify
)
{
QJsonObject
rObj
,
cObj
;
...
...
@@ -346,6 +370,47 @@ bool flowControll::DoSalesSlip(const OrderObject *orderObject, bool bVerify)//
socket
.
close
();
return
false
;
}
bool
flowControll
::
RefuseSalesSlip
(
const
OrderObject
*
orderObject
)
//退单
{
QTcpSocket
socket
;
// 连接
QLOG_INFO
()
<<
InitClass
::
GetInstance
().
GB2312ToUnicode
(
"开始退单"
);
QByteArray
byteSlip
=
_GetOrderRefuseData
(
orderObject
);
QLOG_INFO
()
<<
"this is comming refund slip"
<<
byteSlip
.
data
();
socket
.
connectToHost
(
ConfigManger
::
GetInstance
().
GetSlipIp
(),
ConfigManger
::
GetInstance
().
GetSlipPort
());
if
(
socket
.
waitForConnected
())
{
// 发送
socket
.
write
(
_GetOrderRefuseData
(
orderObject
));
if
(
socket
.
waitForBytesWritten
())
{
// 接收返回
if
(
socket
.
waitForReadyRead
())
{
QJsonObject
recvJson
=
QJsonDocument
::
fromJson
(
socket
.
readAll
()).
object
();
QLOG_INFO
()
<<
QString
(
"refund slip order[%1:%2].[data:%3]"
)
.
arg
(
orderObject
->
order_id
,
orderObject
->
status_desc
)
.
arg
(
_GetJsonStr
(
recvJson
));
if
(
recvJson
[
"statusCode"
].
toInt
()
==
100
)
{
socket
.
close
();
return
true
;
}
else
{
error
=
recvJson
[
"msg"
].
toString
();
socket
.
close
();
return
false
;
}
}
}
}
error
=
socket
.
errorString
();
socket
.
close
();
return
false
;
}
int
flowControll
::
_GetTableVID
(
OrderObject
*
orderObject
)
{
int
table_id
=
TABLE_VID_UNKNOWN
;
...
...
Thread/workThread/flowcontroll.h
View file @
591ea38f
...
...
@@ -44,6 +44,8 @@ public:
void
Total_Num
();
void
SelectTime
();
bool
DoSalesSlip
(
const
OrderObject
*
orderObject
,
bool
bVerify
);
//写销售单
bool
RefuseSalesSlip
(
const
OrderObject
*
orderObject
);
//退单
QByteArray
_GetOrderRefuseData
(
const
OrderObject
*
orderObject
);
//拼接json数据
QByteArray
_GetOrderEntryData
(
const
OrderObject
*
orderObject
,
bool
bVerify
);
//拼接json数据
//自定义网络
...
...
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