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
ce44cc42
Commit
ce44cc42
authored
Apr 14, 2017
by
ss.dai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a
parent
44a58903
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
fmTakeaway/Control/flowControl.cpp
+12
-8
run/printerConfig_tmp.ini
+3
-0
takeaway.pro.user
+1
-1
No files found.
fmTakeaway/Control/flowControl.cpp
View file @
ce44cc42
...
@@ -170,7 +170,6 @@ bool FlowControl::_PullOrder()
...
@@ -170,7 +170,6 @@ bool FlowControl::_PullOrder()
emit
changeOrderStatus
(
orderObject
);
emit
changeOrderStatus
(
orderObject
);
if
(
!
Orderstatus
::
getInstance
().
isorderexit
(
orderId
))
if
(
!
Orderstatus
::
getInstance
().
isorderexit
(
orderId
))
{
{
Orderstatus
::
getInstance
().
statusinsert
(
orderId
,
0
);
Orderstatus
::
getInstance
().
statusinsert
(
orderId
,
0
);
...
@@ -181,14 +180,19 @@ bool FlowControl::_PullOrder()
...
@@ -181,14 +180,19 @@ bool FlowControl::_PullOrder()
QLOG_INFO
()
<<
QString
(
"[---begin to tip---]"
);
QLOG_INFO
()
<<
QString
(
"[---begin to tip---]"
);
// 打印
// 打印
QLOG_INFO
()
<<
QString
(
"[---begin print---]"
);
QLOG_INFO
()
<<
QString
(
"[---begin print---]"
);
if
(
FmPrinter
::
GetInstance
().
DoPrint
(
ConfigManger
::
GetInstance
().
GetPrinterName
(),
orderObject
))
QSettings
tmpIni
(
QString
(
"%1/%2"
).
arg
(
QApplication
::
applicationDirPath
()).
arg
(
"printerConfig_tmp.ini"
),
QSettings
::
IniFormat
);
{
int
num
=
tmpIni
.
value
(
QString
(
"%1/num"
).
arg
(
orderObject
->
channel
),
1
).
toInt
();
QLOG_INFO
()
<<
QString
(
"print sucessful"
);
for
(
int
i
=
0
;
i
<
num
;
i
++
)
Orderstatus
::
getInstance
().
printupdate
(
orderId
,
1
);
}
else
{
{
emit
showAlert
(
AlertForm
::
ERROR
,
QString
(
"打印冲突,请稍后手动打印或重启收银程序"
));
if
(
FmPrinter
::
GetInstance
().
DoPrint
(
ConfigManger
::
GetInstance
().
GetPrinterName
(),
orderObject
))
QLOG_INFO
()
<<
QString
(
"print failed"
);
{
QLOG_INFO
()
<<
QString
(
"print sucessful"
);
Orderstatus
::
getInstance
().
printupdate
(
orderId
,
1
);
}
else
{
emit
showAlert
(
AlertForm
::
ERROR
,
QString
(
"打印冲突,请稍后手动打印或重启收银程序"
));
QLOG_INFO
()
<<
QString
(
"print failed"
);
}
}
}
}
}
}
else
}
else
...
...
run/printerConfig_tmp.ini
0 → 100644
View file @
ce44cc42
[info]
num
=
2
\ No newline at end of file
takeaway.pro.user
View file @
ce44cc42
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.0.0, 2017-04-1
0T18:15:59
. -->
<!-- Written by QtCreator 4.0.0, 2017-04-1
4T09:39:05
. -->
<qtcreator>
<qtcreator>
<data>
<data>
<variable>
EnvironmentId
</variable>
<variable>
EnvironmentId
</variable>
...
...
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