Commit 1c772fb1 by wuyang.zou

fix bug 插件新增显示POS入机小票号;

parent 85b5a3ec
...@@ -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", "");
......
...@@ -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++)
......
...@@ -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>
......
...@@ -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
......
...@@ -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 中的版本号
......
...@@ -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;
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment