Skip to content

F
FmTakeaway
Commit a47fad1d by yunpeng.song
Options

合并代码

parent 75e9dccd
Showing with 83 additions and 14 deletions
fmPrinter/fmPrinter.cpp
......@@ -76,7 +76,7 @@ FmPrinter::FmPrinter()
QSettings *fmps=new QSettings(iniFmpsPath,QSettings::IniFormat);
fmps->setIniCodec("GB2312");
QString printerName = fmps->value("DRIVER/driver").toString();
QString printerDllName; //商米打印机SDK dll特定要求
QString dllpath = fmps->value("DRIVER/path").toString();
if(!printerName.compare(QString("中科英泰")))
printer = ZHONGKEYINGTAI;
......@@ -88,7 +88,10 @@ FmPrinter::FmPrinter()
switch(printer)
{
case ZHONGKEYINGTAI:
m_print_lib.setFileName("pos_ad_dll.dll");
if(dllpath.isEmpty()){
dllpath = "pos_ad_dll.dll";
}
m_print_lib.setFileName(dllpath);
if(m_print_lib.load())
{
m_pOpenPrinter = (fmOpenPrinter)m_print_lib.resolve("OpenPrinter");
......@@ -106,9 +109,10 @@ FmPrinter::FmPrinter()
}
break;
case SHANGMI:
printerDllName = fmps->value("DRIVER/path", "c:\\iSmartSystem\\pos_ad_dll.dll").toString();
qDebug() << printerDllName;
m_UAN_lib.setFileName(printerDllName);
if(dllpath.isEmpty()){
dllpath = "c:\\iSmartSystem\\pos_ad_dll.dll";
}
m_UAN_lib.setFileName(dllpath);
//m_UAN_lib.setFileName("pos_ad_dll.dll");
if(m_UAN_lib.load())
{
......@@ -495,7 +499,7 @@ bool FmPrinter::_PrintBodyForShangmiPrinter(OrderObject *pData)
bool FmPrinter::_RawDataToPrinter(QString printerName, QString data)
{
QByteArray tmpData = data.toLocal8Bit();
char temchar[2048]={0x0};
char temchar[4096]={0x0};
if(m_b_load_sucfl)
{
strcpy(temchar,tmpData.data());
......
fmTakeaway/Control/flowControl.cpp
......@@ -81,6 +81,8 @@ bool FlowControl::_Login()
{
m_timestamp = recvJson[JSON_TIMESTAMPS].toString();
DataManger::GetInstance().SetToken(recvJson[JSON_TOKEN].toString());
DataManger::GetInstance().SetStoreId(m_storeId);
DataManger::GetInstance().SetPartnerId("1418");
emit hideAlert();
emit setStoreInfo(m_storeId);
m_storeName = recvJson[JSON_STORENAME].toString();
......@@ -198,7 +200,7 @@ bool FlowControl::_PullOrder()
{
Orderstatus::getInstance().statusinsert(orderId,0);
}
if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId)&&orderObject->order_type!=3)
if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId)&&(orderObject->order_type!=3||!orderObject->channel.compare("koubeiwaimai")))
{
emit startRemind(0);
QLOG_INFO()<<QString("[---begin to tip---]");
......@@ -591,7 +593,7 @@ bool FlowControl::_ChargeOffOrder(const QString &orderId)
{
emit showAlert(AlertForm::SUCCESS, "核销成功!");
if(m_ordersMap.value(orderId)->order_type == 3)
if(m_ordersMap.value(orderId)->order_type == 3 && m_ordersMap.value(orderId)->channel.compare("koubeiwaimai"))
{
// 打印
QLOG_INFO() << QString("[---begin print---]");
......
fmTakeaway/DTools/dataManger.cpp
......@@ -21,6 +21,16 @@ DataManger &DataManger::GetInstance()
return dm;
}
void DataManger::SetStoreId(const QString &storeId)
{
m_storeId = storeId;
}
void DataManger::SetPartnerId(const QString &partnerId)
{
m_parternId = partnerId;
}
void DataManger::SetToken(const QString &token)
{
m_token = token;
......@@ -35,6 +45,8 @@ QJsonObject DataManger::GetLoginData(const QString &storeId, const QString &pass
rObj.insert(JSON_CURRENTUSER, cObj);
rObj.insert(JSON_STATIONID, stationId);
rObj.insert(JSON_OPERATORID, cashierId);
rObj.insert("store_id", storeId);
rObj.insert("partnerid", 1418);
return rObj;
}
......@@ -46,6 +58,8 @@ QJsonObject DataManger::GetPullOrderData(const QString &timestamp)
rObj.insert(JSON_AUTOCONFIRM, "1");
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -59,6 +73,8 @@ QJsonObject DataManger::GetPullDeliverData(const QString &storeId, const QString
rObj.insert(JSON_CHANNEL, channelCode);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -73,6 +89,8 @@ QJsonObject DataManger::GetConfirmOrderData(const QString &orderId, const QStrin
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -85,6 +103,8 @@ QJsonObject DataManger::GetRefuseOrderData(int refuseCode, const QString &orderI
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -99,6 +119,8 @@ QJsonObject DataManger::GetSendOrderData(const QString &orderId, const QString &
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -110,6 +132,8 @@ QJsonObject DataManger::GetCompleteOrderData(const QString &orderId)
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -122,6 +146,8 @@ QJsonObject DataManger::GetRefundOrderData(const QString &reason, const QString
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -134,6 +160,8 @@ QJsonObject DataManger::GetAgreeRefundData(const QString &reason, const QString
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -146,6 +174,8 @@ QJsonObject DataManger::GetRefuseRefundData(const QString &reason, const QString
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -165,6 +195,8 @@ QJsonObject DataManger::GetSynStockData(const QList<StockObject> &stockList)
rObj.insert(JSON_STOCKARRAY, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -178,6 +210,8 @@ QJsonObject DataManger::GetReportOERData(const QString &orderId, int status, con
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -191,6 +225,8 @@ QJsonObject DataManger::GetChargeOffData(const QString &orderId)
rObj.insert(JSON_ORDER, cObj);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_POSVERSION, APP_VERSION);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -201,7 +237,8 @@ QJsonObject DataManger::GetPullSingleOrder(const QString &orderId)
cObj.insert("order_id", orderId);
rObj.insert("order", cObj);
rObj.insert("token", m_token);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -211,7 +248,8 @@ QJsonObject DataManger::GetPullDishesData(const QString &channelCode, QString st
rObj.insert(JSON_REQTYPE, PULL_DISHES);
rObj.insert(JSON_CHANNEL, channelCode);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -229,7 +267,8 @@ QJsonObject DataManger::GetUpdDishesData(QString channelCode, QString disheId, i
rObj.insert("dishes", dishes);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -238,6 +277,8 @@ QJsonObject DataManger::GetStoreChannelInfoData()
QJsonObject rObj;
rObj.insert(JSON_REQTYPE, GET_STORE_CHANNEL_INFO);
rObj.insert(JSON_TOKEN, m_token);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -248,6 +289,8 @@ QJsonObject DataManger::GetOperatingStatusData(const QString &channel, int statu
rObj.insert(JSON_TOKEN, m_token);
rObj.insert(JSON_CHANNEL, channel);
rObj.insert("business_status", status);
rObj.insert("store_id", m_storeId);
rObj.insert("partnerid", m_parternId);
return rObj;
}
......@@ -258,5 +301,7 @@ QJsonObject DataManger::GetRefundDetails(const QString &orderId)
order.insert("order_id", orderId);
json.insert("order", order);
json.insert("token", m_token);
json.insert("store_id", m_storeId);
json.insert("partnerid", m_parternId);
return json;
}
fmTakeaway/DTools/dataManger.h
......@@ -14,6 +14,16 @@ public:
* 参数:[1]token
* 返回:NULL
* */
void SetStoreId(const QString& storeId);
/* 功能:设置token信息
* 参数:[1]token
* 返回:NULL
* */
void SetPartnerId(const QString& partnerId);
/* 功能:设置token信息
* 参数:[1]token
* 返回:NULL
* */
void SetToken(const QString& token);
/* 功能:获取登录数据
* 参数:[1]门店号[2]密码[3]收银机号[4]收银员号
......@@ -124,6 +134,8 @@ private:
DataManger& operator=(DataManger const&);
// token
QString m_token;
QString m_storeId;
QString m_parternId;
};
#endif // DATAMANGER_H
fmTakeaway/mainForm.cpp
......@@ -127,7 +127,7 @@ void MainForm::_Init()
// 初始化文字
ui->mainLabStoreid->setText(UI_STOREID);
ui->mainLabVersion->setText("1.4.3");
ui->mainLabVersion->setText(APP_VERSION);
ui->mainLabCashier->setText(UI_CASHIER);
// 初始化表
......
fmTakeaway/preDefine.h
......@@ -4,7 +4,7 @@
#include <QDebug>
#define APP_THEME "deaufult"
#define APP_VERSION "1.20160923.01" //TODO
#define APP_VERSION "1.4.7" //TODO
#define SERVER_PASSWORD "posoperator@freemud.cn"
//#define SERVER_PASSWORD "pos@freemud.cn"
......
fmTakeaway/settingForm.cpp
......@@ -25,6 +25,7 @@ SettingForm::SettingForm(QWidget *parent) :
}
}
ui->settingCbxPrinter->addItem("中科英泰");
ui->settingCbxPrinter->addItem("商米打印机");
ui->settingCbxPrinter->addItem("默认");
// ui->settingCbxPrinter->addItem("COM1");
......@@ -52,6 +53,7 @@ void SettingForm::on_settingCbxPrinter_activated(const QString &text)
if(!text.compare("默认"))
{
ConfigManger::GetInstance().setPrinterMode("1");
ConfigManger::GetInstance().SetPrinterName("deafult");
}
else if(!text.compare("COM1"))
{
......@@ -73,7 +75,11 @@ void SettingForm::on_settingCbxPrinter_activated(const QString &text)
ConfigManger::GetInstance().setPrinterMode("0");
ConfigManger::GetInstance().setPrinterCom("COM4");
}
else{
else if(!text.compare("商米打印机")){
ConfigManger::GetInstance().setPrinterMode("4");
ConfigManger::GetInstance().SetPrinterName("SHANGMI");
}
else {
ConfigManger::GetInstance().setPrinterMode("4");
ConfigManger::GetInstance().SetPrinterName(text);
}
......
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