Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
takeout_sbk
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
yunpeng.song
takeout_sbk
Commits
1c772fb1
Commit
1c772fb1
authored
Oct 31, 2019
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 插件新增显示POS入机小票号;
parent
85b5a3ec
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
8 deletions
+13
-8
fmTakeout/Control/flowControl.cpp
+2
-0
fmTakeout/detailForm.cpp
+3
-0
fmTakeout/detailForm.ui
+1
-1
fmTakeout/fmTakeout.rc
+4
-4
fmTakeout/preDefine.h
+1
-1
run/skin/deaufult.qss
+2
-2
run/skin/deaufult.rcc
+0
-0
No files found.
fmTakeout/Control/flowControl.cpp
View file @
1c772fb1
...
@@ -1934,6 +1934,8 @@ bool FlowControl::_ResponseSimphony04Request(const QJsonObject &content, QJsonOb
...
@@ -1934,6 +1934,8 @@ bool FlowControl::_ResponseSimphony04Request(const QJsonObject &content, QJsonOb
}
}
bRetReportCheckNo
=
SimProcOrderDB
::
getInstance
().
updatePosOrderCheckNo
(
orderId
,
posCheckNo
);
bRetReportCheckNo
=
SimProcOrderDB
::
getInstance
().
updatePosOrderCheckNo
(
orderId
,
posCheckNo
);
//入机成功更新插件上POS小票号显示;
order_p
->
dataBasePosOrderCheckNo
=
posCheckNo
;
/***** 解析 汇报POS小票号是否成功:bRetReportCheckNo:true->成功********/
/***** 解析 汇报POS小票号是否成功:bRetReportCheckNo:true->成功********/
QJsonObject
rObj
,
cObj
;
QJsonObject
rObj
,
cObj
;
rObj
.
insert
(
"fm_cmd"
,
""
);
rObj
.
insert
(
"fm_cmd"
,
""
);
...
...
fmTakeout/detailForm.cpp
View file @
1c772fb1
...
@@ -67,6 +67,9 @@ void DetailForm::InitData(OrderObject *orderObject)
...
@@ -67,6 +67,9 @@ void DetailForm::InitData(OrderObject *orderObject)
ui
->
detailLab7
->
setText
(
orderObject
->
msr_no
.
length
()
?
orderObject
->
msr_no
:
orderObject
->
customerId
);
// MSR_NO
ui
->
detailLab7
->
setText
(
orderObject
->
msr_no
.
length
()
?
orderObject
->
msr_no
:
orderObject
->
customerId
);
// MSR_NO
ui
->
detailLab5
->
setText
(
QString
(
"[%1]"
).
arg
(
orderObject
->
memo
));
ui
->
detailLab5
->
setText
(
QString
(
"[%1]"
).
arg
(
orderObject
->
memo
));
//订单在 POS 上最新开单号:红色属性设置;
ui
->
detailLab8
->
setText
(
QString
(
"[ %1 ]"
).
arg
(
orderObject
->
dataBasePosOrderCheckNo
));
int
i
=
0
,
pNum
=
0
,
coupNum
=
0
;
int
i
=
0
,
pNum
=
0
,
coupNum
=
0
;
/*********************************** 遍历 商品列表:商品信息展示 begin ***************************************************/
/*********************************** 遍历 商品列表:商品信息展示 begin ***************************************************/
for
(;
i
<
orderObject
->
proList
.
count
();
i
++
,
pNum
++
)
for
(;
i
<
orderObject
->
proList
.
count
();
i
++
,
pNum
++
)
...
...
fmTakeout/detailForm.ui
View file @
1c772fb1
...
@@ -782,7 +782,7 @@
...
@@ -782,7 +782,7 @@
</size>
</size>
</property>
</property>
<property name="text">
<property name="text">
<string
/
>
<string
>POS开单号:</string
>
</property>
</property>
<property name="alignment">
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignCenter</set>
...
...
fmTakeout/fmTakeout.rc
View file @
1c772fb1
...
@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico"
...
@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico"
#endif
#endif
VS_VERSION_INFO VERSIONINFO
VS_VERSION_INFO VERSIONINFO
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
FILEVERSION 2,2019,916,
1
FILEVERSION 2,2019,916,
2
PRODUCTVERSION 2,2019,916,
1
PRODUCTVERSION 2,2019,916,
2
//*************************************************************************//
//*************************************************************************//
FILEFLAGSMASK 0x3fL
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
#ifdef _DEBUG
...
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
...
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "Delivery Order Plugin"
VALUE "ProductName", "Delivery Order Plugin"
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
VALUE "ProductVersion", "2.2019.916.
1
"
VALUE "ProductVersion", "2.2019.916.
2
"
VALUE "FileVersion", "2.2019.916.
1
"
VALUE "FileVersion", "2.2019.916.
2
"
//*************************************************************************//
//*************************************************************************//
END
END
END
END
...
...
fmTakeout/preDefine.h
View file @
1c772fb1
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
//#define APP_VERSION "2.2019.528.1"
//#define APP_VERSION "2.2019.528.1"
//#define APP_VERSION "2.2019.729.1"
//#define APP_VERSION "2.2019.729.1"
//#define APP_VERSION "2.2019.815.1"
//#define APP_VERSION "2.2019.815.1"
#define APP_VERSION "2.2019.916.
1
"
#define APP_VERSION "2.2019.916.
2
"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号
//修正版本号时,切记修正 FmTakeout.rc 中的版本号
...
...
run/skin/deaufult.qss
View file @
1c772fb1
...
@@ -624,14 +624,14 @@ QTabBar QToolButton::left-arrow:disabled {
...
@@ -624,14 +624,14 @@ QTabBar QToolButton::left-arrow:disabled {
border: 1px solid #ececec;
border: 1px solid #ececec;
}
}
#detailLab0,#detailLab2,#detailLab3,#detailLab4,
#detailLab0,#detailLab2,#detailLab3,#detailLab4,
#detailLab5,#detailLab6,#detailLab7
,#detailLab8
#detailLab5,#detailLab6,#detailLab7
{
{
border-top: 1px solid #ececec;
border-top: 1px solid #ececec;
border-bottom: 1px solid #ececec;
border-bottom: 1px solid #ececec;
color: #4d4d4d;
color: #4d4d4d;
background-color: #faf9f9;
background-color: #faf9f9;
}
}
#detailLab1
#detailLab1
,#detailLab8
{
{
color: rgb(190, 63, 0);
color: rgb(190, 63, 0);
background-color: #faf9f9;
background-color: #faf9f9;
...
...
run/skin/deaufult.rcc
View file @
1c772fb1
No preview for this file type
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