添加快捷键

JxcClient.pro

@@ -17,6 +17,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 include($$PWD/pqQtlib/pqQtlib.pri)
 
+msvc{
+    QMAKE_CFLAGS += -source-charset:utf-8
+    QMAKE_CXXFLAGS += -source-charset:utf-8
+}
+
+
 SOURCES += \
     configinfo.cpp \
     globalinfo.cpp \
@@ -50,6 +56,7 @@ SOURCES += \
     widget/packdetailform.cpp \
     widget/selectvalueform.cpp \
     widget/settingsform.cpp \
+    widget/shortcutconfig.cpp \
     widget/showmadanlabelform.cpp \
     widget/showxiangdanlabelform.cpp \
     widget/statisticsform.cpp \
@@ -87,6 +94,7 @@ HEADERS += \
     widget/packdetailform.h \
     widget/selectvalueform.h \
     widget/settingsform.h \
+    widget/shortcutconfig.h \
     widget/showmadanlabelform.h \
     widget/showxiangdanlabelform.h \
     widget/statisticsform.h \
@@ -103,6 +111,7 @@ FORMS += \
     widget/packdetailform.ui \
     widget/selectvalueform.ui \
     widget/settingsform.ui \
+    widget/shortcutconfig.ui \
     widget/showmadanlabelform.ui \
     widget/showxiangdanlabelform.ui \
     widget/statisticsform.ui \

configinfo.cpp

@@ -3,7 +3,8 @@
 ConfigInfo::ConfigInfo()
 {
     //TODO: 小宋，给每个成员设置默认值
-    baseUrl = "http://erp.itwsw.cn/api";
+//    baseUrl = "http://erp.itwsw.cn/api";
+    baseUrl = "http://xshx.huaxianyun.com/api";
     packId = 0;
     printerName = "TSC TTP-244 Pro";
     portName = "COM1";
@@ -31,7 +32,7 @@ void ConfigInfo::load()
 void ConfigInfo::save()
 {
     QJsonObject obj;
-    obj.insert("baseUrl","http://erp.itwsw.cn/api");
+    obj.insert("baseUrl","http://xshx.huaxianyun.com/api");
     obj.insert("printerName","TSC TTP-244 Pro");
     obj.insert("portName","COM1");
     obj.insert("portBaudRate",9600);

handle/httprequest.cpp

@@ -41,7 +41,7 @@ void HttpRequest::post(const QString & url, const QMap<QString, QString> &body)
 void HttpRequest::finishRequest(QNetworkReply * reply)
 {
     if (reply->error()){
-        qDebug()<<"Error!"<<endl;
+        //qDebug()<<"Error!"<<endl;
         emit result(500, QJsonObject());
     }else{
         QByteArray byte_array = reply->readAll();
@@ -69,7 +69,7 @@ QNetworkRequest HttpRequest::request(const QString & url)
     return req;
 }
 
-void HttpRequest::initRequest(QNetworkRequest & req, bool post)
+void HttpRequest::initRequest(QNetworkRequest & req, bool /*post*/)
 {
     if(!_aid.isEmpty()){
         req.setRawHeader("Auid",_aid.toUtf8());

handle/printer/boxtemlateone.cpp

@@ -38,8 +38,9 @@ QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box)
     font.setFamily("宋体");
     font.setPixelSize(40);
     font.setWeight(QFont::ExtraLight);
+    font.setBold(true);
     painter.setFont(font);
-    painter.drawText(6*5,15*5,box->parentPack()->customer);
+    painter.drawText(5*5,5*5,90*5,15*5, Qt::AlignCenter, box->parentPack()->customer);
 
     font.setPixelSize(20);
     font.setBold(true);
@@ -67,12 +68,15 @@ QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box)
     painter.drawText(67*5,46*5,box->twist_type);//datalist.at(4));
     painter.drawText(67*5,53*5,box->bucket_color);//datalist.at(6));
 
-    font.setPixelSize(17);
+    font.setPixelSize(16);
     painter.setFont(font);
     painter.drawText(21*5,53*5,box->caseNumber());//datalist.at(5));
 
 
-    painter.drawText(4*5,75*5," 电话:"+ box->parentPack()->telephone);
+    font.setPixelSize(20);
+    painter.setFont(font);
+    painter.drawText(5*5,70*5,90*5,7*5, Qt::AlignCenter, "服务电话:"+ box->parentPack()->telephone);
+    //painter.drawText(4*5,75*5," 电话:"+ box->parentPack()->telephone);
 
 //    print(image);
 
@@ -189,7 +193,8 @@ QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box,int ModelIndex)
     font.setFamily("宋体");
     font.setPixelSize(40);
     font.setWeight(QFont::ExtraLight);
-    painter.setFont(font);
+    painter.setFont(font);font.setPixelSize(20);
+    font.setBold(true);
     painter.drawText(6*5,15*5,box->parentPack()->customer);
 
     font.setPixelSize(20);
@@ -235,7 +240,7 @@ QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box,int ModelIndex)
     painter.setFont(font);
 
 
-    painter.drawText(4*5,75*5," 电话:"+ box->parentPack()->telephone);
+    painter.drawText(QRect(4*5,75*5, 100*5, 65*5), Qt::AlignCenter, "服务电话:"+ box->parentPack()->telephone);
 
 //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
 //        image.save(path+"/xiangdan/code"+bar+".bmp");
@@ -322,7 +327,8 @@ QImage BoxTemlateOne::Boxmodel()
 
     font.setPixelSize(17);
     painter.setFont(font);
-    painter.drawText(4*5,75*5," 电话:11111111111");
+//    painter.drawText(4*5,75*5," 电话:11111111111");
+    painter.drawText(QRect(4*5,75*5, 100*5, 65*5), Qt::AlignCenter, "服务电话:11111111111");
 //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
 //    if(save)
 //        image.save(path+"/xiangdan/code"+"11111"+".bmp");

handle/printer/code39.cpp

@@ -66,7 +66,7 @@ void Code39::draw(QPainter & painter, QRect & pos,QString & barcode)
     QString BinaryNum = CodeBinary(barcode);
     int MAXHEIGHT = pos.height();
     int MAXWIDTH = pos.width();
-    int FONTHEIGHT=10; //预留10px的左右空白；
+    int FONTHEIGHT=40; //预留10px的左右空白；
     int widght = MAXWIDTH - FONTHEIGHT;
     //设定条码线条宽度px
     int LineWidth = widght / BinaryNum.size();
@@ -104,7 +104,7 @@ void Code39::draw(QPainter & painter, QRect & pos,QString & barcode)
     font.setPixelSize(5*5);
     font.setWeight(QFont::ExtraLight);
     painter.setFont(font);
-    painter.drawText(0*5,MAXHEIGHT+1,MAXWIDTH,17,Qt::AlignCenter,/*"S/N:" +*/ barcode);
+    painter.drawText(0*5,MAXHEIGHT+5,MAXWIDTH,17,Qt::AlignCenter,/*"S/N:" +*/ barcode);
 
     painter.restore();
 }

handle/remotepackconfig.cpp

@@ -116,6 +116,7 @@ void RemotePackConfig::refConfig()
 //    _token = body["access_token"].toString();
     _request.setUserToken(QString::number( glo->user().accountId) ,glo->user().acessToken);
     QString url = glo->config()->baseUrl+"/v1/configuration";
+    qDebug() << url;
     _request.get(url);
 }
 

handle/seriport/logserialport.cpp

@@ -5,11 +5,6 @@
 #include <pqQtlib/utils/pqendian.h>
 #include "cstring"
 
-
-#ifdef _MSC_VER
-#pragma execution_character_set("utf-8")
-#endif
-
 LogSerialPort::LogSerialPort()
 {
     buchang  = 0;

handle/seriport/logserialport.h

@@ -14,10 +14,6 @@
 #include "globalinfo.h"
 #include "serialbasehandle.h"
 
-#ifdef _MSC_VER
-#pragma execution_character_set("utf-8")
-#endif
-
 class LogSerialPort : public PQ::RTUHelper, public SerialBaseHandle
 {
 public:

mainwindow.cpp

@@ -2,9 +2,11 @@
 #include "ui_mainwindow.h"
 #include "handle/seriport/serialbasehandle.h"
 
+#include "widget/shortcutconfig.h"
+
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
-    , ui(new Ui::MainWindow)
+    , ui(new Ui::MainWindow), config(nullptr)
 {
     ui->setupUi(this);
     connect(ui->widgetLogin,&LoginForm::loginFinish,this,&MainWindow::backMenu);
@@ -241,3 +243,14 @@ void MainWindow::on_backButton_clicked()
 {
     ui->stackedWidget->setCurrentWidget(ui->pageMain);
 }
+
+void MainWindow::on_action_2_triggered()
+{
+    if(!config) {
+        config = new ShortcutConfig;
+        connect(config, &ShortcutConfig::setShortcutConfig,ui->dingzhong,&FixedWeightPackForm::setShortcutConfig);
+        connect(config, &ShortcutConfig::setShortcutConfig,ui->buding, &UncertainWeightPackForm::setShortcutConfig);
+    }
+    config->setWindowModality(Qt::ApplicationModal);
+    config->show();
+}

mainwindow.h

@@ -11,6 +11,8 @@ QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }
 QT_END_NAMESPACE
 
+class ShortcutConfig;
+
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
@@ -28,6 +30,8 @@ private slots:
 
     void on_backButton_clicked();
 
+    void on_action_2_triggered();
+
 private:
     void backMenu();
     void backSelect(int i = 0);
@@ -51,6 +55,7 @@ protected:
     void closeEvent(QCloseEvent *event); // 关闭时调用
 private:
     Ui::MainWindow *ui;
+    ShortcutConfig *config;
     HttpRequest *httprequest;
 };
 #endif // MAINWINDOW_H

mainwindow.ui

@@ -232,7 +232,7 @@
      <x>0</x>
      <y>0</y>
      <width>1033</width>
-     <height>26</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu">
@@ -273,10 +273,17 @@
     <addaction name="actionXiangDan"/>
     <addaction name="actionMaDan"/>
    </widget>
+   <widget class="QMenu" name="menu_6">
+    <property name="title">
+     <string>设置</string>
+    </property>
+    <addaction name="action_2"/>
+   </widget>
    <addaction name="menu"/>
    <addaction name="menu_2"/>
    <addaction name="menu_3"/>
    <addaction name="menu_5"/>
+   <addaction name="menu_6"/>
   </widget>
   <action name="actionSetting">
    <property name="text">
@@ -354,6 +361,11 @@
     <string>码单模板</string>
    </property>
   </action>
+  <action name="action_2">
+   <property name="text">
+    <string>快捷键设置</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

widget/fixedweightpackform.cpp

@@ -29,6 +29,9 @@ FixedWeightPackForm::FixedWeightPackForm(QWidget *parent) :
     }
 //    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->dingzhong->setChecked(true);
+
+    //初始化快捷键
+    setShortcutConfig();
 }
 
 FixedWeightPackForm::~FixedWeightPackForm()
@@ -711,3 +714,15 @@ void FixedWeightPackForm::on_useNewDataButton_clicked()
     packinfo->autoRuku = ui->ruku->isChecked();
     restTableWidget();
 }
+
+void FixedWeightPackForm::setShortcutConfig()
+{
+    QSettings configIniWrite("jcxclient.ini", QSettings::IniFormat);
+    QVariant key1 = configIniWrite.value("Shortcut/key1", "F1");
+    QVariant key2 = configIniWrite.value("Shortcut/key2", "F2");
+    QVariant key3 = configIniWrite.value("Shortcut/key3", "F3");
+
+    ui->addBoxList->setShortcut(QKeySequence(key1.toString()));
+    ui->addPackList->setShortcut(QKeySequence(key2.toString()));
+    ui->pushPiLiang->setShortcut(QKeySequence(key3.toString()));
+}

widget/fixedweightpackform.h

@@ -22,7 +22,7 @@ public:
 
     void setProInfo(const QSharedPointer<ProjectInfo> & info);
     inline void setAutoSync(const bool sync){AutoSync = sync;}
-
+    void setShortcutConfig();
 private slots:
     void on_addBoxList_clicked();
 
@@ -52,6 +52,7 @@ private slots:
 
     void on_useNewDataButton_clicked();
 
+
 public slots:
     void upconfig(/*const DaBaoConfig & config*/);
     void upDengjiInfo(/*const QList<DengJiConfigItem> & dengJis*/);

widget/loginform.cpp

@@ -43,16 +43,24 @@ void LoginForm::on_pushLogin_clicked()
     auto glo = GlobalInfo::this_();
     auto uname = this->ui->lineUser->text();
     auto upass = this->ui->linePass->text();
+//    auto url = glo->config()->baseUrl+"/api/v1/signin";
     auto url = glo->config()->baseUrl+"/v1/signin";
 //    QMap<QString,QString> params;
 //    params.insert("password",upass);
 //    params.insert("username",uname);
 
+    if(uname.size() <= 0 || uname.size() <= 0) {
+        QMessageBox::information(this,"注意","请输入正确的账号密码");
+        return;
+    }
+
     QJsonObject obj;
     obj.insert("password",upass);
     obj.insert("username",uname);
     obj.insert("platform",2);
 
+    qDebug() << url << obj.toVariantMap();
+
     request()->post(url,obj);
     ui->status->setVisible(true);
     this->setEnabled(false);
@@ -65,9 +73,8 @@ void  LoginForm::clear(){
     }
 }
 
-HttpRequest  * LoginForm::request()
+HttpRequest *LoginForm::request()
 {
-
     if(!_request){
         _request = new HttpRequest(this);
         connect(_request,&HttpRequest::result,this,&LoginForm::result);
@@ -76,7 +83,7 @@ HttpRequest  * LoginForm::request()
 }
 
 
-void LoginForm::result(int code, const QJsonObject & body)
+void LoginForm::result(int /*code*/, const QJsonObject & body)
 {
     qDebug()<<body;
     ui->status->setVisible(false);
@@ -110,7 +117,7 @@ void LoginForm::result(int code, const QJsonObject & body)
     user.acessToken = data["access_token"].toString();
 //    GlobalInfo::this_()->setUser(user);
     GlobalInfo::this_()->start(user,false);
-//    emit loginFinish();
+    emit loginFinish();
 }
 
 void LoginForm::on_pushButton_2_clicked()

widget/settingsform.cpp

@@ -52,7 +52,6 @@ void SettingsForm::on_back_btn_clicked()
 
 void SettingsForm::on_save_btn_clicked()
 {
-
     QJsonObject obj;
     obj.insert("baseUrl",ui->baseUrlLine->text());
     obj.insert("printerName",ui->printerName->currentText());

widget/shortcutconfig.cpp

@@ -0,0 +1,45 @@
+#include "shortcutconfig.h"
+#include "ui_shortcutconfig.h"
+#include "globalinfo.h"
+
+ShortcutConfig::ShortcutConfig(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::ShortcutConfig)
+{
+    ui->setupUi(this);
+    //    ui->keySequenceEdit
+    QSettings configIniWrite("jcxclient.ini", QSettings::IniFormat);
+
+    QVariant key1 = configIniWrite.value("Shortcut/key1", "F1");
+    QVariant key2 = configIniWrite.value("Shortcut/key2", "F2");
+    QVariant key3 = configIniWrite.value("Shortcut/key3", "F3");
+
+    ui->keySequenceEdit->setKeySequence(key1.toString());
+    ui->keySequenceEdit_2->setKeySequence(key2.toString());
+    ui->keySequenceEdit_3->setKeySequence(key3.toString());
+
+//    configIniWrite.value("Shortcut/key2");
+//    configIniWrite.value("Shortcut/key3");
+
+//    configIniWrite.setValue("Shortcut/key1", "192.168.0.1");
+//    configIniWrite.setValue("Shortcut/key2", "127.0.0.1");
+//    configIniWrite.setValue("Shortcut/key3", "2222");
+
+}
+
+ShortcutConfig::~ShortcutConfig()
+{
+    delete ui;
+}
+
+void ShortcutConfig::on_pushButton_clicked()
+{
+
+    QSettings configIniWrite("jcxclient.ini", QSettings::IniFormat);
+
+    configIniWrite.setValue("Shortcut/key1", ui->keySequenceEdit->keySequence().toString());
+    configIniWrite.setValue("Shortcut/key2", ui->keySequenceEdit_2->keySequence().toString());
+    configIniWrite.setValue("Shortcut/key3", ui->keySequenceEdit_3->keySequence().toString());
+
+    emit setShortcutConfig();
+}

widget/shortcutconfig.h

@@ -0,0 +1,26 @@
+#ifndef SHORTCUTCONFIG_H
+#define SHORTCUTCONFIG_H
+
+#include <QWidget>
+
+namespace Ui {
+class ShortcutConfig;
+}
+
+class ShortcutConfig : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ShortcutConfig(QWidget *parent = nullptr);
+    ~ShortcutConfig();
+signals:
+    void setShortcutConfig();
+private slots:
+    void on_pushButton_clicked();
+
+private:
+    Ui::ShortcutConfig *ui;
+};
+
+#endif // SHORTCUTCONFIG_H

widget/shortcutconfig.ui

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ShortcutConfig</class>
+ <widget class="QWidget" name="ShortcutConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>280</width>
+    <height>296</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="1">
+    <widget class="QPushButton" name="pushButton">
+     <property name="text">
+      <string>保存</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>批量添加</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>添加码单</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>添加箱单</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="1" colspan="2">
+    <widget class="QKeySequenceEdit" name="keySequenceEdit_3"/>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QKeySequenceEdit" name="keySequenceEdit_2"/>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QKeySequenceEdit" name="keySequenceEdit"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

widget/uncertainweightpackform.cpp

@@ -38,6 +38,8 @@ UncertainWeightPackForm::UncertainWeightPackForm(QWidget *parent) :
     ui->autoSync->setChecked(true);
     ui->buding->setChecked(true);
 //    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+
+    setShortcutConfig();
 }
 
 UncertainWeightPackForm::~UncertainWeightPackForm()
@@ -715,3 +717,14 @@ void UncertainWeightPackForm::on_useNewDataButton_clicked()
 //    packinfo->warehouse_id = ui->wareBox->currentData().toInt();
     restTableWidget();
 }
+
+
+void UncertainWeightPackForm::setShortcutConfig()
+{
+    QSettings configIniWrite("jcxclient.ini", QSettings::IniFormat);
+    QVariant key4 = configIniWrite.value("Shortcut/key1", "F1");
+    QVariant key5 = configIniWrite.value("Shortcut/key2", "F2");
+
+    ui->addBoxList->setShortcut(QKeySequence(key4.toString()));
+    ui->addPackList->setShortcut(QKeySequence(key5.toString()));
+}

widget/uncertainweightpackform.h

@@ -69,6 +69,7 @@ private:
     void EditBatch();
 
 public slots:
+    void setShortcutConfig();
     void upconfig();
     void upDengjiInfo();
     void changeSpecs();