Skip to content

F
fmtakeout
Commit bdc6c083 by 李定达
Options

1.分离主机副机串口打印配置;

parent 5603a0b2
Showing with 192 additions and 29 deletions
takeout/base/Print/printlib.cpp
......@@ -132,7 +132,7 @@ void PrintLib::_PrintLab( OrderObject* order)
f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),tmptitle.toLocal8Bit().data(),0);
f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),"-----------------------------------",0.0266666);
f_TSCWinPrintln(10,0,24,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(), prodname.
append(" ¥").
append(QString("\x20\xC2\xA5")).
append(QString::number(dish->price/100.0, 'f', 2)).toLocal8Bit().data(),0.0666665);
QString property_tags;
if(!dish->property_tags.isEmpty())
......@@ -176,9 +176,9 @@ void PrintLib::_PrintLab( OrderObject* order)
}
}
bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error)
bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error, bool other_prt)
{
QByteArray iniData = _GetPrintIni().toLocal8Bit();
QByteArray iniData = _GetPrintIni(other_prt).toLocal8Bit();
char inichar[2048]={0x0};
strcpy(inichar,iniData.data());
if(m_b_load_sucfl)
......@@ -219,10 +219,10 @@ bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QStr
}
}
bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString &error)
bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString &error, bool other_prt)
{
QByteArray iniData = _GetPrintIni().toLocal8Bit();
QByteArray iniData = _GetPrintIni(other_prt).toLocal8Bit();
char inichar[2048]={0x0};
strcpy(inichar,iniData.data());
if(m_b_load_sucfl)
......@@ -263,10 +263,10 @@ bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString
}
}
bool PrintLib::OnlyDoPrint(const QString &content, OrderObject *orderObject, QString &error)
bool PrintLib::OnlyDoPrint(const QString &content, OrderObject *orderObject, QString &error, bool other_prt)
{
QByteArray iniData = _OnlyGetPrintIni().toLocal8Bit();
QByteArray iniData = _OnlyGetPrintIni(other_prt).toLocal8Bit();
char inichar[2048]={0x0};
strcpy(inichar,iniData.data());
if(m_b_load_sucfl)
......@@ -560,7 +560,7 @@ PrintLib &PrintLib::GetInstance()
return fp;
}
QString PrintLib::_GetPrintIni()
QString PrintLib::_GetPrintIni(bool other_prt)
{
QString path = QString("%1/printer.ini").arg(QCoreApplication::applicationDirPath());
QSettings config(path, QSettings::IniFormat);
......@@ -630,10 +630,68 @@ QString PrintLib::_GetPrintIni()
ini.append( config.value("Printer/labelprttype","4").toString());
ini.append("|");
if(other_prt)
{
QString comname = config.value("OTHERCOMDEF/com","COM0").toString();
QString tmpname = "0";
if(comname.size() > 3)
{
tmpname = comname.left(comname.size() - 3);
}
//come
ini.append(tmpname);
ini.append("|");
//iBaudrate
ini.append( config.value("OTHERCOMDEF/Baudrate","9600").toString());
ini.append("|");
//iDataBits
ini.append( config.value("OTHERCOMDEF/DataBits","-1").toString());
ini.append("|");
//iStopBits
ini.append( config.value("OTHERCOMDEF/StopBits","-1").toString());
ini.append("|");
//iParity
ini.append( config.value("OTHERCOMDEF/Parity","-1").toString());
ini.append("|");
//iFlowControl
ini.append( config.value("OTHERCOMDEF/FlowControl","-1").toString());
ini.append("|");
}
else
{
QString comname = config.value("COMDEF/com","COM0").toString();
QString tmpname = "0";
if(comname.size() > 3)
{
tmpname = comname.left(comname.size() - 3);
}
//come
ini.append(tmpname);
ini.append("|");
//iBaudrate
ini.append( config.value("COMDEF/Baudrate","9600").toString());
ini.append("|");
//iDataBits
ini.append( config.value("COMDEF/DataBits","-1").toString());
ini.append("|");
//iStopBits
ini.append( config.value("COMDEF/StopBits","-1").toString());
ini.append("|");
//iParity
ini.append( config.value("COMDEF/Parity","-1").toString());
ini.append("|");
//iFlowControl
ini.append( config.value("COMDEF/FlowControl","-1").toString());
ini.append("|");
}
return ini;
}
QString PrintLib::_OnlyGetPrintIni()
QString PrintLib::_OnlyGetPrintIni(bool other_prt)
{
QString path = QString("%1/printer.ini").arg(QCoreApplication::applicationDirPath());
QSettings config(path, QSettings::IniFormat);
......@@ -681,5 +739,71 @@ QString PrintLib::_OnlyGetPrintIni()
ini.append( config.value("Printer/labelprttype","4").toString());
ini.append("|");
// com=COM5
// Baudrate=19200
// DataBits=8
// StopBits=0
// Parity=0
// FlowControl=0
//com
if(other_prt)
{
QString comname = config.value("OTHERCOMDEF/com","COM0").toString();
QString tmpname = "0";
if(comname.size() > 3)
{
tmpname = comname.left(comname.size() - 3);
}
//come
ini.append(tmpname);
ini.append("|");
//iBaudrate
ini.append( config.value("OTHERCOMDEF/Baudrate","9600").toString());
ini.append("|");
//iDataBits
ini.append( config.value("OTHERCOMDEF/DataBits","-1").toString());
ini.append("|");
//iStopBits
ini.append( config.value("OTHERCOMDEF/StopBits","-1").toString());
ini.append("|");
//iParity
ini.append( config.value("OTHERCOMDEF/Parity","-1").toString());
ini.append("|");
//iFlowControl
ini.append( config.value("OTHERCOMDEF/FlowControl","-1").toString());
ini.append("|");
}
else
{
QString comname = config.value("COMDEF/com","COM0").toString();
QString tmpname = "0";
if(comname.size() > 3)
{
tmpname = comname.left(comname.size() - 3);
}
//come
ini.append(tmpname);
ini.append("|");
//iBaudrate
ini.append( config.value("COMDEF/Baudrate","9600").toString());
ini.append("|");
//iDataBits
ini.append( config.value("COMDEF/DataBits","-1").toString());
ini.append("|");
//iStopBits
ini.append( config.value("COMDEF/StopBits","-1").toString());
ini.append("|");
//iParity
ini.append( config.value("COMDEF/Parity","-1").toString());
ini.append("|");
//iFlowControl
ini.append( config.value("COMDEF/FlowControl","-1").toString());
ini.append("|");
}
return ini;
}
takeout/base/Print/printlib.h
......@@ -19,8 +19,8 @@ public:
public:
static PrintLib& GetInstance();
bool DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error);
bool DoPrint(const QString &content, OrderObject *orderObject, QString &error);
bool DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error, bool other_prt = false);
bool DoPrint(const QString &content, OrderObject *orderObject, QString &error, bool other_prt = false);
void _PrintLab( OrderObject* order);
//bool OpenPrinter();
......@@ -33,8 +33,8 @@ public:
bool DoTestLabelPrint(QByteArray iniData, OrderObject *orderObject);
bool DoTestPrint(QByteArray iniData, const QString &content, OrderObject *orderObject, QString &error);
void _PrintLabTest();
QString _OnlyGetPrintIni();
bool OnlyDoPrint(const QString &content, OrderObject *orderObject, QString &error);
QString _OnlyGetPrintIni(bool other_prt = false);
bool OnlyDoPrint(const QString &content, OrderObject *orderObject, QString &error, bool other_prt = false);
private:
typedef bool ( *OpenPrinter)( void);
......@@ -79,7 +79,7 @@ private:
TSCWinPrintPage f_TSCWinPrintPage;
OrderObject *_order;
QString _GetPrintIni();
QString _GetPrintIni(bool other_prt = false);
void _PrintLine(const LineNode& line, ProductObject* dish=0);
void _PrintProcudt(const QList<LineNode *> &list, const QList<int> &protlist);
bool _PrintLineNode(const PrintDocument &doc, OrderObject *orderObject);
......
takeout/control/orderprintwork.cpp
......@@ -244,7 +244,7 @@ bool orderprintwork::event(QEvent *e)
contents = QString::fromUtf8(file.readAll());
file.close();
if(otherprint.OnlyDoPrint(contents, &order, error))
if(otherprint.OnlyDoPrint(contents, &order, error, true))
{
QLOG_INFO() << "print succcess";
......
takeout/preDefine.h
......@@ -281,5 +281,6 @@
#define DEFAULT_PRINTF_OTHER_SESSION "OtherPrinter"
#define DEFAULT_SESSION_COMDEF "COMDEF"
#define DEFAULT_SESSION_OTHERCOMDEF "OTHERCOMDEF"
#endif // PREDEFINE_H
takeout/view/detailForm.cpp
......@@ -88,13 +88,13 @@ bool DetailForm::getOtherOrderOptAndName(OrderObject *order, QString &optname, Q
switch (status) {
case NewOrder:
if(QString("saas").compare(order->channel) != 0)
{
// if(QString("saas").compare(order->channel) != 0)
// {
optname = OPERATION_REFUSE;
name = QString::fromLocal8Bit(OPERATIONNAME_REFUNDNEWORDER);
return true;
}
return false;
// }
//return false;
case FirmOrder:
return false;
case CancelOrder:
......
takeout/view/prtsettingform.cpp
......@@ -35,7 +35,8 @@ PrtSettingForm::PrtSettingForm(QWidget *parent) :
* labe_high 标签纸高
* label_type 标签打印类型
****************/
void PrtSettingForm::GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type, QString prtwit)
void PrtSettingForm::GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type, QString prtwit,
QString comname, QString bdl, QString dat, QString control, QString stop, QString jy)
{
std::string ini;
//ini.append(config.value("Printer/Name").toString());
......@@ -147,6 +148,27 @@ void PrtSettingForm::GetData(char *data, QString type, QString lptname, QString
//ini.append( config.value("Printer/label_ip").toString());
ini.append("4");
ini.append("|");
//------------------------------
QString coms = comname;
QString tmpname = "0";
if(coms.size() > 3)
{
tmpname = coms.right(coms.size() - 3);
}
ini.append(tmpname.toUtf8().data());
ini.append("|");
ini.append(bdl.toUtf8().data());
ini.append("|");
ini.append(dat.toUtf8().data());
ini.append("|");
ini.append(stop.toUtf8().data());
ini.append("|");
ini.append(jy.toUtf8().data());
ini.append("|");
ini.append(control.toUtf8().data());
ini.append("|");
strcpy(data, ini.c_str());
}
......@@ -233,6 +255,11 @@ void PrtSettingForm::on_pushButton_test_clicked()
QString session = DEFAULT_SESSION_COMDEF;
if(ui->comboBox_prt_type->currentIndex() == 0)
session = DEFAULT_SESSION_COMDEF;
else
session = DEFAULT_SESSION_OTHERCOMDEF;
QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
QLOG_DEBUG() << "printf file name : " << filename;
......@@ -257,7 +284,9 @@ void PrtSettingForm::on_pushButton_test_clicked()
QLOG_INFO() << type;
GetData(arr, type, ui->lineEdit_lpt->text(), ui->lineEdit_usb->text(), ui->lineEdit_ip->text(), name, ui->lineEdit_lab_name->text(), ui->lineEdit_lab_widgh->text(),
ui->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText());
ui->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText(),
ui->lineEdit_com->text(), ui->comboBox_com_btl->currentText(), ui->comboBox_com_suw->currentText(),
ui->comboBox_com_control->currentText(), ui->comboBox_com_stop->currentText(), ui->comboBox_com_jy->currentText());
QLOG_INFO() << "prt info" << arr;
......@@ -310,7 +339,9 @@ void PrtSettingForm::on_btn_lab_test_clicked()
GetData(arr, type, ui->lineEdit_lpt->text(), ui->lineEdit_usb->text(),ui->lineEdit_ip->text(), name, labelname, ui->lineEdit_lab_widgh->text(),
ui->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText());
ui->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText(),
ui->lineEdit_com->text(), ui->comboBox_com_btl->currentText(), ui->comboBox_com_suw->currentText(),
ui->comboBox_com_control->currentText(), ui->comboBox_com_stop->currentText(), ui->comboBox_com_jy->currentText());
QLOG_INFO() << "prt info" << arr;
......@@ -355,14 +386,21 @@ void PrtSettingForm::on_pushButton_save_clicked()
QString filename = qApp->applicationDirPath() + "/" + PREINTER_CONSS;
QString tmpsession = DEFAULT_SESSION_COMDEF;
if(ui->comboBox_prt_type->currentIndex() == 0)
tmpsession = DEFAULT_SESSION_COMDEF;
else
tmpsession = DEFAULT_SESSION_OTHERCOMDEF;
if(QString("0").compare(type) == 0)
{
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "Baudrate", ui->comboBox_com_btl->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "com", ui->lineEdit_com->text());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "DataBits", ui->comboBox_com_suw->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "StopBits", ui->comboBox_com_stop->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "Parity", ui->comboBox_com_jy->currentText());
QSettings(filename, QSettings::IniFormat).setValue(QString(DEFAULT_SESSION_COMDEF) + "/" + "FlowControl", ui->comboBox_com_control->currentText());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "Baudrate", ui->comboBox_com_btl->currentText());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "com", ui->lineEdit_com->text());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "DataBits", ui->comboBox_com_suw->currentText());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "StopBits", ui->comboBox_com_stop->currentText());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "Parity", ui->comboBox_com_jy->currentText());
QSettings(filename, QSettings::IniFormat).setValue(tmpsession + "/" + "FlowControl", ui->comboBox_com_control->currentText());
}
QString Wigth = ui->comboBox_width->currentText();
......
takeout/view/prtsettingform.h
......@@ -14,7 +14,7 @@ class PrtSettingForm : public QDialog
public:
explicit PrtSettingForm(QWidget *parent = 0);
~PrtSettingForm();
void GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type, QString prtwit = "");
void GetData(char *data, QString type, QString lptname, QString usbname, QString ip, QString name, QString label_name, QString label_wigth, QString labe_high, QString label_type, QString prtwit = "", QString comname = "0", QString bdl = "9600", QString dat="-1", QString control="-1", QString stop = "-1", QString jy="-1");
private slots:
void on_pushButton_test_clicked();
......
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