Skip to content

F
fmtakeout
Commit ac5852fd by 李定达
Options

1.添加纸张宽度可选;2.丰富测试纸打印内容

parent ee7155a1
Showing with 65 additions and 15 deletions
takeout/control/orderprintwork.cpp
......@@ -58,21 +58,21 @@ bool orderprintwork::event(QEvent *e)
if(order.order_type == 1 || order.order_type == 2)
{
if(prtwi == 56)
if(prtwi <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTTAKE_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTTAKE80_TEMPLET);
}
else if(order.order_type == 6)
{
if(prtwi == 56)
if(prtwi <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTYY_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTYY80_TEMPLET);
}
else
{
if(prtwi == 56)
if(prtwi <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT80_TEMPLET);
......@@ -166,14 +166,21 @@ bool orderprintwork::event(QEvent *e)
if(order.order_type == 1 || order.order_type == 2)
{
if(othprtw == 56)
if(othprtw <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTTAKE_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTTAKE80_TEMPLET);
}
else if(order.order_type == 6)
{
if(othprtw <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTYY_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINTYY80_TEMPLET);
}
else
{
if(othprtw == 56)
if(othprtw <= 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT80_TEMPLET);
......
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,8
PRODUCTVERSION 2,0,0,8
FILEVERSION 2,0,0,9
PRODUCTVERSION 2,0,0,9
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
......@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
VALUE "FileDescription", "FREEMUD Manager System"
VALUE "FileVersion", "2.0.0.8"
VALUE "FileVersion", "2.0.0.9"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "2.0.0.8"
VALUE "ProductVersion", "2.0.0.9"
END
END
BLOCK "VarFileInfo"
......
takeout/view/prtsettingform.cpp
......@@ -35,7 +35,7 @@ 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)
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)
{
std::string ini;
//ini.append(config.value("Printer/Name").toString());
......@@ -57,7 +57,11 @@ void PrtSettingForm::GetData(char *data, QString type, QString lptname, QString
ini.append("|");
//ini.append(config.value("Printer/PaperWidth").toString());
ini.append("40");
if(!prtwit.isEmpty())
ini.append(prtwit.toUtf8().data());
else
ini.append("80");
//ini.append("40");
ini.append("|");
//ini.append(config.value("Printer/levlel").toString());
ini.append("All");
......@@ -186,7 +190,7 @@ void PrtSettingForm::on_pushButton_test_clicked()
QFile file;
if(QString("80").compare(ui->comboBox_width->currentText()) == 0)
if(ui->comboBox_width->currentText().toInt() > 56)
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT80_TEMPLET);
else
file.setFileName(qApp->applicationDirPath() + "/" + FILE_PRINT_TEMPLET);
......@@ -208,6 +212,10 @@ void PrtSettingForm::on_pushButton_test_clicked()
OrderObject order;
order.store_name = QString("\xE9\x9D\x9E\xE7\xA0\x81\xE4\xB8\x8A\xE6\xB5\xB7\xE5\xB8\x82\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE6\xB5\x8B\xE8\xAF\x95\xE5\xBA\x97");
order.order_index = 999;
order.code = "123456789";
char arr[2048] = {0};
QString type = "4";
......@@ -249,7 +257,7 @@ 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->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText());
QLOG_INFO() << "prt info" << arr;
......@@ -302,7 +310,7 @@ 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->lineEdit_lab_high->text(), labtype, ui->comboBox_width->currentText());
QLOG_INFO() << "prt info" << arr;
......
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);
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 = "");
private slots:
void on_pushButton_test_clicked();
......
takeout/view/prtsettingform.ui
......@@ -776,9 +776,44 @@
</item>
<item>
<property name="text">
<string>75</string>
</property>
</item>
<item>
<property name="text">
<string>70</string>
</property>
</item>
<item>
<property name="text">
<string>68</string>
</property>
</item>
<item>
<property name="text">
<string>65</string>
</property>
</item>
<item>
<property name="text">
<string>60</string>
</property>
</item>
<item>
<property name="text">
<string>56</string>
</property>
</item>
<item>
<property name="text">
<string>50</string>
</property>
</item>
<item>
<property name="text">
<string>45</string>
</property>
</item>
</widget>
</item>
</layout>
......
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