Skip to content

T
takeout_sbk
Commit e404fbdd by wuyang.zou
Options

新功能：将订单备注: eleme consumerRemark 保存订单本地POS 数数据库; 

新版本：2.2020.26.1
parent 8f6509a4
Showing with 21 additions and 13 deletions
fmTakeout/Control/flowControl.cpp
...@@ -2760,7 +2760,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -2760,7 +2760,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
cObj.insert("customer_address", orderObject->addressDetail); cObj.insert("customer_address", orderObject->addressDetail);
cObj.insert("delivery_time", orderObject->deliveryTime); cObj.insert("delivery_time", orderObject->deliveryTime);
cObj.insert("create_time",orderObject->createTime); cObj.insert("create_time",orderObject->createTime);
cObj.insert("remark", orderObject->memo); cObj.insert("remark", orderObject->memo); //orderObject->memo:餐具 | orderObject->consumerRemark:顾客备注
cObj.insert("has_invoice",orderObject->needInvoice); cObj.insert("has_invoice",orderObject->needInvoice);
cObj.insert("invoice_title",orderObject->invoiceTitle); cObj.insert("invoice_title",orderObject->invoiceTitle);
cObj.insert("pay_ebcode_str", orderObject->channel); cObj.insert("pay_ebcode_str", orderObject->channel);
......
fmTakeout/DTools/printSumBillPosDB.cpp
...@@ -255,8 +255,8 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& ...@@ -255,8 +255,8 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
QSqlQuery query(m_sqlDb); QSqlQuery query(m_sqlDb);
query.prepare("INSERT INTO tb_msr_customer_info(chk_num, last_name, full_name, gender, " query.prepare("INSERT INTO tb_msr_customer_info(chk_num, last_name, full_name, gender, "
"is_birthday, create_datetime, created_by, modify_datetime, modified_by, accept_name, accept_address, accept_phone, order_id, " "is_birthday, create_datetime, created_by, modify_datetime, modified_by, accept_name, accept_address, accept_phone, order_id, "
"order_status, waybill_id, take_no, deliver_phone, deliver_name, disPlateformFee, memo, reserve3) " "order_status, waybill_id, take_no, deliver_phone, deliver_name, disPlateformFee, memo, reserve3, reserve4) "
"VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
query.addBindValue(posCheckNo.toInt()); // --小票号 query.addBindValue(posCheckNo.toInt()); // --小票号
query.addBindValue(orderObj->lastName); // --顾客-姓 query.addBindValue(orderObj->lastName); // --顾客-姓
query.addBindValue(orderObj->consigneeName); // --顾客-全名 query.addBindValue(orderObj->consigneeName); // --顾客-全名
...@@ -285,6 +285,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& ...@@ -285,6 +285,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
query.addBindValue( abs(orderObj->disPlateformFee)); // --平台优惠 query.addBindValue( abs(orderObj->disPlateformFee)); // --平台优惠
query.addBindValue(orderObj->memo); // --订单备注 query.addBindValue(orderObj->memo); // --订单备注
query.addBindValue(orderObj->secretSignal); // --接头暗号 query.addBindValue(orderObj->secretSignal); // --接头暗号
query.addBindValue(orderObj->consumerRemark); // --顾客备注
QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill waybillId:%1-->>>>]").arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0")); QLOG_INFO()<<QString("[<<<--PrintSumBillPosDB::insertOrderSumBill waybillId:%1-->>>>]").arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0"));
...@@ -295,14 +296,15 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& ...@@ -295,14 +296,15 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
QLOG_INFO()<<QString("INSERT INTO tb_msr_customer_info(chk_num, last_name, full_name, gender, " QLOG_INFO()<<QString("INSERT INTO tb_msr_customer_info(chk_num, last_name, full_name, gender, "
"is_birthday, create_datetime, created_by, modify_datetime, modified_by, " "is_birthday, create_datetime, created_by, modify_datetime, modified_by, "
"accept_name, accept_address, accept_phone, order_id, " "accept_name, accept_address, accept_phone, order_id, "
"waybill_id, take_no, deliver_phone, deliver_name, disPlateformFee, memo, reserve3) " "waybill_id, take_no, deliver_phone, deliver_name, disPlateformFee, memo, reserve3, reserve4) "
"VALUES(%1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17, %18, %19, %20)").arg(posCheckNo.toInt()) "VALUES(%1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17, %18, %19, %20, %21)").arg(posCheckNo.toInt())
.arg(orderObj->lastName).arg(orderObj->customerName).arg(temp_customerSex) .arg(orderObj->lastName).arg(orderObj->customerName).arg(temp_customerSex)
.arg(0).arg(qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss")).arg(FlowControl::GetInstance()._GetCashierId()).arg("").arg("") .arg(0).arg(qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss")).arg(FlowControl::GetInstance()._GetCashierId()).arg("").arg("")
.arg(orderObj->consigneeName).arg(orderObj->addressDetail).arg(orderObj->consigneePhone).arg(orderObj->id) .arg(orderObj->consigneeName).arg(orderObj->addressDetail).arg(orderObj->consigneePhone).arg(orderObj->id)
.arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0")) .arg((orderObj->waybillId).length()?orderObj->waybillId:QString("0"))
.arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt()) .arg(orderObj->pickupCode.length()==0?0:orderObj->pickupCode.toInt())
.arg(orderObj->riderPhone).arg(orderObj->riderName).arg(abs(orderObj->disPlateformFee)).arg(orderObj->memo).arg(orderObj->secretSignal); .arg(orderObj->riderPhone).arg(orderObj->riderName).arg(abs(orderObj->disPlateformFee))
.arg(orderObj->memo).arg(orderObj->secretSignal).arg(orderObj->consumerRemark);
} else { } else {
QLOG_INFO()<<QString("[<<<<---SqlServer Database:Insert OrderId %1 Into customer_info Success--->>>>]").arg(orderObj->id); QLOG_INFO()<<QString("[<<<<---SqlServer Database:Insert OrderId %1 Into customer_info Success--->>>>]").arg(orderObj->id);
result = true; result = true;
......
fmTakeout/Model/orderObject.h
...@@ -41,6 +41,7 @@ class OrderObject : public QObject ...@@ -41,6 +41,7 @@ class OrderObject : public QObject
Q_PROPERTY (QString cancelTime READ getCancelTime WRITE setCancelTime) Q_PROPERTY (QString cancelTime READ getCancelTime WRITE setCancelTime)
Q_PROPERTY (QString cancelReason READ getCancelReason WRITE setCancelReason) Q_PROPERTY (QString cancelReason READ getCancelReason WRITE setCancelReason)
Q_PROPERTY (QString memo READ getMemo WRITE setMemo) Q_PROPERTY (QString memo READ getMemo WRITE setMemo)
Q_PROPERTY (QString consumerRemark READ getConsumerRemark WRITE setConsumerRemark)
Q_PROPERTY (QString invoiceType READ getInvoiceType WRITE setInvoiceType) Q_PROPERTY (QString invoiceType READ getInvoiceType WRITE setInvoiceType)
Q_PROPERTY (QString invoiceTitle READ getInvoiceTitle WRITE setInvoiceTitle) Q_PROPERTY (QString invoiceTitle READ getInvoiceTitle WRITE setInvoiceTitle)
Q_PROPERTY (QString invoiceTaxpayerId READ getInvoiceTaxpayerId WRITE setInvoiceTaxpayerId) Q_PROPERTY (QString invoiceTaxpayerId READ getInvoiceTaxpayerId WRITE setInvoiceTaxpayerId)
...@@ -133,6 +134,7 @@ public: ...@@ -133,6 +134,7 @@ public:
QString cancelTime; QString cancelTime;
QString cancelReason; QString cancelReason;
QString memo; QString memo;
QString consumerRemark; // 客户备注;
QString invoiceType; QString invoiceType;
QString invoiceTitle; QString invoiceTitle;
QString invoiceTaxpayerId; QString invoiceTaxpayerId;
...@@ -276,6 +278,9 @@ public: ...@@ -276,6 +278,9 @@ public:
inline QString getMemo()const{return memo;} inline QString getMemo()const{return memo;}
inline void setMemo(const QString& v){memo = v;} inline void setMemo(const QString& v){memo = v;}
inline QString getConsumerRemark() const { return consumerRemark; }
inline void setConsumerRemark(const QString& v) { consumerRemark = v; }
inline QString getInvoiceType()const{return invoiceType;} inline QString getInvoiceType()const{return invoiceType;}
inline void setInvoiceType(const QString& v){invoiceType = v;} inline void setInvoiceType(const QString& v){invoiceType = v;}
......
fmTakeout/detailForm.cpp
...@@ -66,7 +66,7 @@ void DetailForm::InitData(OrderObject *orderObject) ...@@ -66,7 +66,7 @@ void DetailForm::InitData(OrderObject *orderObject)
QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailSlab6 --->>>>]"); QLOG_INFO() << QString("[<<<<---DetailForm::InitData ui->detailSlab6 --->>>>]");
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 | %2 ]").arg( orderObject->memo).arg(orderObject->consumerRemark) );
//订单在 POS 上最新开单号:红色属性设置; //订单在 POS 上最新开单号:红色属性设置;
ui->detailLab8->setText(QString("[ %1 ]").arg(orderObject->dataBasePosOrderCheckNo)); ui->detailLab8->setText(QString("[ %1 ]").arg(orderObject->dataBasePosOrderCheckNo));
......
fmTakeout/fmTakeout.rc
...@@ -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,1224,1 FILEVERSION 2,2020,26,1
PRODUCTVERSION 2,2019,1224,1 PRODUCTVERSION 2,2020,26,1
//*************************************************************************// //*************************************************************************//
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
...@@ -27,12 +27,12 @@ VS_VERSION_INFO VERSIONINFO ...@@ -27,12 +27,12 @@ VS_VERSION_INFO VERSIONINFO
VALUE "CompanyName", "ShangHai.Freemud Co., Ltd." VALUE "CompanyName", "ShangHai.Freemud Co., Ltd."
VALUE "FileDescription", "Delivery Order Plugin Application" VALUE "FileDescription", "Delivery Order Plugin Application"
VALUE "InternalName", "fmTakeout.exe" VALUE "InternalName", "fmTakeout.exe"
VALUE "LegalCopyright", "Copyright (C)2014-2019" VALUE "LegalCopyright", "Copyright (C)2014-2020"
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.1224.1" VALUE "ProductVersion", "2.2020.26.1"
VALUE "FileVersion", "2.2019.1224.1" VALUE "FileVersion", "2.2020.26.1"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
//#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.2" //#define APP_VERSION "2.2019.916.2"
#define APP_VERSION "2.2019.1224.1" //#define APP_VERSION "2.2019.1224.1" //未有机会发版;
#define APP_VERSION "2.2020.26.1"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
......
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