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
c6ea42f2
Commit
c6ea42f2
authored
Dec 28, 2017
by
shangshang.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add 1:新增退款小票的打印
Upd 1:修改订单详情[合计->优惠合计]
parent
5b7ab2ce
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
13 deletions
+54
-13
fmPrinter/fmPrinter.cpp
+40
-11
fmTakeaway/Control/flowControl.cpp
+13
-1
fmTakeaway/detailForm.ui
+1
-1
No files found.
fmPrinter/fmPrinter.cpp
View file @
c6ea42f2
...
...
@@ -173,20 +173,49 @@ QString FmPrinter::_GetPrintData(OrderObject *pData)
remark
=
QString
(
"备注:"
)
+
pData
->
remark
.
remove
(
QChar
(
'|'
),
Qt
::
CaseInsensitive
);
}
if
(
!
pData
->
channelName
.
compare
(
"饿了么"
))
QString
str0
=
pData
->
channelName
;
QString
strUrl
(
"http://qr10.cn/Du2Cfw"
);
QString
strDesc
(
"下载APP 积分换好礼"
);
QString
bPrintImg
(
"1"
);
QString
bPrintCode
(
"1"
);
QString
bPrintXXCHC
(
"1"
);
if
(
pData
->
status
==
20
)
{
print
=
str_print
.
append
(
QString
(
"(鲜丰水果)"
)
+
storename
).
append
(
"|"
).
append
(
"#"
+
QString
::
number
(
pData
->
order_index
)
+
" 饿了么"
).
append
(
"|"
).
append
(
pData
->
order_type
==
3
?
"自提"
:
pData
->
delivery_party
).
append
(
"|"
).
append
(
pData
->
order_view_id
.
isEmpty
()
?
pData
->
order_id
:
pData
->
order_view_id
).
append
(
"|"
).
append
(
QDateTime
::
fromTime_t
(
pData
->
create_time
).
toString
(
"yy-MM-dd hh:mm"
))
.
append
(
"|"
).
append
(
deliveryStr
).
append
(
"|"
).
append
(
remark
).
append
(
"|"
).
append
(
invoice
).
append
(
"|"
).
append
(
pData
->
invoice_title
).
append
(
"|"
).
append
(
str_comd_list
).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
send_fee
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
discount_fee
))
.
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
send_fee
)).
append
(
"|"
).
append
(
QString
::
number
(
pData
->
total_amount
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
discount_fee
)).
append
(
"|"
).
append
(
pData
->
customer
).
append
(
"|"
).
append
(
pData
->
address
).
append
(
"|"
).
append
(
pData
->
phone
).
append
(
"|"
).
append
(
"http://qr10.cn/Du2Cfw"
).
append
(
"|"
).
append
(
"下载APP 积分换好礼"
);
}
else
str0
=
pData
->
channelName
+
"(顾客申请退单)"
;
remark
=
QString
(
"请马上联系站点沟通顾客,否则取消单将算入门店异常取消单,影响门店排名,站点电话在平台软件订单里面点击更多联系人"
);
strUrl
=
"NULL"
;
strDesc
=
"NULL"
;
bPrintImg
=
"0"
;
bPrintCode
=
"0"
;
deliveryStr
=
"NULL"
;
bPrintXXCHC
=
"0"
;
}
else
if
(
pData
->
status
==
21
)
{
print
=
str_print
.
append
(
QString
(
"(鲜丰水果)"
)
+
storename
).
append
(
"|"
).
append
(
"#"
+
QString
::
number
(
pData
->
order_index
)).
append
(
pData
->
channelName
).
append
(
"|"
).
append
(
pData
->
order_type
==
3
?
"自提"
:
pData
->
delivery_party
).
append
(
"|"
).
append
(
pData
->
order_view_id
.
isEmpty
()
?
pData
->
order_id
:
pData
->
order_view_id
).
append
(
"|"
).
append
(
QDateTime
::
fromTime_t
(
pData
->
create_time
).
toString
(
"yy-MM-dd hh:mm"
))
.
append
(
"|"
).
append
(
deliveryStr
).
append
(
"|"
).
append
(
remark
).
append
(
"|"
).
append
(
invoice
).
append
(
"|"
).
append
(
pData
->
invoice_title
).
append
(
"|"
).
append
(
str_comd_list
).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
send_fee
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
discount_fee
))
.
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
send_fee
)).
append
(
"|"
).
append
(
QString
::
number
(
pData
->
total_amount
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
discount_fee
)).
append
(
"|"
).
append
(
pData
->
customer
).
append
(
"|"
).
append
(
pData
->
address
).
append
(
"|"
).
append
(
pData
->
phone
).
append
(
"|"
).
append
(
"http://qr10.cn/Du2Cfw"
).
append
(
"|"
).
append
(
"下载APP 积分换好礼"
);
str0
=
pData
->
channelName
+
"(顾客申请部分退单)"
;
remark
=
QString
(
"请马上联系站点沟通顾客,否则取消单将算入门店异常取消单,影响门店排名,站点电话在平台软件订单里面点击更多联系人"
);
strUrl
=
"NULL"
;
strDesc
=
"NULL"
;
bPrintImg
=
"0"
;
bPrintCode
=
"0"
;
deliveryStr
=
"NULL"
;
bPrintXXCHC
=
"0"
;
}
// if(!pData->channelName.compare("饿了么"))
// {
// print = str_print.append(QString("(鲜丰水果)")+storename).append("|").append("#"+QString::number(pData->order_index)+" 饿了么").append("|").append(pData->order_type==3?"自提":pData->delivery_party).append("|").append(pData->order_view_id.isEmpty()?pData->order_id:pData->order_view_id).append("|").append(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm"))
// .append("|").append(deliveryStr).append("|").append(remark).append("|").append(invoice).append("|").append(pData->invoice_title).append("|").append(str_comd_list).append("|").append(_Penny2Dollar(pData->total_fee-pData->send_fee)).append("|").append(_Penny2Dollar(pData->discount_fee))
// .append("|").append(_Penny2Dollar(pData->send_fee)).append("|").append(QString::number(pData->total_amount)).append("|").append(_Penny2Dollar(pData->total_fee-pData->discount_fee)).append("|").append(pData->customer).append("|").append(pData->address).append("|").
// append(pData->phone).append("|").append("http://qr10.cn/Du2Cfw").append("|").append("下载APP 积分换好礼");
// }
// else
// {
print
=
str_print
.
append
(
QString
(
"(鲜丰水果)"
)
+
storename
).
append
(
"|"
).
append
(
"#"
+
QString
::
number
(
pData
->
order_index
)).
append
(
str0
).
append
(
"|"
).
append
(
pData
->
order_type
==
3
?
"自提"
:
pData
->
delivery_party
).
append
(
"|"
).
append
(
bPrintCode
).
append
(
"|"
).
append
(
pData
->
order_view_id
.
isEmpty
()
?
pData
->
order_id
:
pData
->
order_view_id
).
append
(
"|"
).
append
(
QDateTime
::
fromTime_t
(
pData
->
create_time
).
toString
(
"yy-MM-dd hh:mm"
))
.
append
(
"|"
).
append
(
deliveryStr
).
append
(
"|"
).
append
(
bPrintImg
).
append
(
"|"
).
append
(
remark
).
append
(
"|"
).
append
(
invoice
).
append
(
"|"
).
append
(
pData
->
invoice_title
).
append
(
"|"
).
append
(
str_comd_list
).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
send_fee
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
discount_fee
))
.
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
send_fee
)).
append
(
"|"
).
append
(
QString
::
number
(
pData
->
total_amount
)).
append
(
"|"
).
append
(
_Penny2Dollar
(
pData
->
total_fee
-
pData
->
discount_fee
)).
append
(
"|"
).
append
(
pData
->
customer
).
append
(
"|"
).
append
(
pData
->
address
).
append
(
"|"
).
append
(
pData
->
phone
).
append
(
"|"
).
append
(
bPrintXXCHC
).
append
(
"|"
).
append
(
strUrl
).
append
(
"|"
).
append
(
strDesc
);
//鲜丰水果
// if(!v.compare("顾客留存"))
//{
...
...
fmTakeaway/Control/flowControl.cpp
View file @
c6ea42f2
#include "flowControl.h"
#include "flowControl.h"
#include "fmPlugin.h"
#include "fmPrinter.h"
#include "QsLog.h"
...
...
@@ -250,6 +250,18 @@ bool FlowControl::_PullOrder()
}
}
if
(
orderObject
->
status
==
20
||
orderObject
->
status
==
21
)
{
if
(
FmPrinter
::
GetInstance
().
DoPrint
(
ConfigManger
::
GetInstance
().
GetPrinterName
(),
orderObject
))
{
QLOG_INFO
()
<<
QString
(
"print sucessful"
);
}
else
{
emit
showAlert
(
AlertForm
::
ERROR
,
QString
(
"打印冲突,请稍后手动打印或重启收银程序"
));
QLOG_INFO
()
<<
QString
(
"print failed"
);
}
}
// 订单完成后两小时写销售单
// if(orderObject->status == 6 || orderObject->status == 200)
// {
...
...
fmTakeaway/detailForm.ui
View file @
c6ea42f2
...
...
@@ -988,7 +988,7 @@
</size>
</property>
<property
name=
"text"
>
<string>
合计:
</string>
<string>
优惠
合计:
</string>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignCenter
</set>
...
...
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