1.补充提交

takeout/control/ordergetwork.cpp

@@ -10,6 +10,7 @@
 #include <QTimer>
 #include <QEventLoop>
 #include <QVariantMap>
+#include <QSettings>
 
 #include "QsLog.h"
 
@@ -365,6 +366,16 @@ bool OrderGetWork::bingToServer(QString &error)
 }
 
 #else
+void OrderGetWork::SetStoreInfoToConfig()
+{
+    QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
+
+    QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_PARNETID, _storeinfo[JSON_KEY_PARTNERID]);
+    QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_STOREID, _storeinfo[JSON_STOREID]);
+    QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_STATIONIID, _storeinfo[JSON_STATIONID]);
+    QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_USERID, _storeinfo[JSON_KEY_USERID]);
+    QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_PWD, _storeinfo[JSON_KEY_PWD]);
+}
 
 bool OrderGetWork::loginToServer(QString &error)
 {

takeout/control/ordergetwork.h

@@ -77,7 +77,8 @@ private:
     bool PullOrder(unsigned int timeout, QString &error);
     //订单操作
     void optOrderWithType(const QVariantMap &map);
-
+    //登录成功回写数据
+    void SetStoreInfoToConfig();
 private:
     //门店信息 门店编号 pos编号 用户名 密码
     QVariantMap _storeinfo;

takeout/control/workcontrol.h

@@ -2,7 +2,7 @@
 #define WORKCONTROL_H
 
 #include <QObject>
-
+//根据配置实例化工作流为实现;
 class WorkControl : public QObject
 {
     Q_OBJECT

takeout/takeout.pro

@@ -56,7 +56,8 @@ SOURCES += main.cpp \
     control/orderlocalizework.cpp \
     control/orderprintwork.cpp \
     view/loginform.cpp \
-    model/discountObject.cpp
+    model/discountObject.cpp \
+    control/workcontrol.cpp
 
 HEADERS  += \
     event/fmapplication.h \
@@ -91,7 +92,8 @@ HEADERS  += \
     control/orderlocalizework.h \
     control/orderprintwork.h \
     view/loginform.h \
-    model/discountObject.h
+    model/discountObject.h \
+    control/workcontrol.h
 
 DISTFILES += takeout.rc
 

takeout/takeout.rc

@@ -4,8 +4,8 @@
 #include <winver.h>
 #endif
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 1,0,0,7
-    PRODUCTVERSION 1,0,0,7
+    FILEVERSION 1,0,0,8
+    PRODUCTVERSION 1,0,0,8
     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", "1.0.0.7"
+                VALUE "FileVersion", "1.0.0.8"
                 VALUE "InternalName", "FREEMUD"
                 VALUE "LegalCopyright", "Copyright (C)2017-2020"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "fmTakeout"
-                VALUE "ProductVersion", "1.0.0.7"
+                VALUE "ProductVersion", "1.0.0.8"
             END
         END
         BLOCK "VarFileInfo"

takeout/view/loginform.cpp

@@ -8,6 +8,7 @@
 
 #include <QDebug>
 #include <QVariantMap>
+#include <QSettings>
 
 
 #include <QsLog.h>
@@ -25,6 +26,8 @@ LoginForm::LoginForm(QWidget *parent) :
     connect(ui->lineEdit_account, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
     connect(ui->lineEdit_partnerid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
     connect(ui->lineEdit_pwd, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
+    connect(ui->lineEdit_posno, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
+    connect(ui->lineEdit_storeid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
 
     connect(ui->pushButton_0, &QPushButton::clicked, this, &LoginForm::number_btn_click);
     connect(ui->pushButton_1, &QPushButton::clicked, this, &LoginForm::number_btn_click);
@@ -74,15 +77,32 @@ LoginForm::~LoginForm()
     delete ui;
 }
 
+void LoginForm::SetStoreInfo()
+{
+    QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
+
+    QString storeid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_STOREID).toString();
+    QString partnerid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_PARNETID).toString();
+    QString userid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_USERID).toString();
+    QString pwd = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_PWD).toString();
+    QString stationid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_STATIONIID).toString();
+
+    if(storeid.isEmpty() || partnerid.isEmpty() || userid.isEmpty() || pwd.isEmpty() || stationid.isEmpty())
+        return ;
+
+    ui->lineEdit_partnerid->setText(partnerid);
+    ui->lineEdit_storeid->setText(storeid);
+    ui->lineEdit_posno->setText(stationid);
+    ui->lineEdit_account->setText(userid);
+    ui->lineEdit_pwd->setText(pwd);
+}
+
 void LoginForm::showfull()
 {
     if(!is_login)
     {
-//        ui->lineEdit_account->clear();
-//        ui->lineEdit_partnerid->clear();
-//        ui->lineEdit_pwd->clear();
+        SetStoreInfo();
         this->showFullScreen();
-        //this->show();
         return ;
     }
 
@@ -156,9 +176,11 @@ void LoginForm::on_pushButton_login_clicked()
 
     if(ui->lineEdit_account->text().isEmpty() ||
        ui->lineEdit_pwd->text().isEmpty() ||
-       ui->lineEdit_partnerid->text().isEmpty())
+       ui->lineEdit_partnerid->text().isEmpty() ||
+       ui->lineEdit_posno->text().isEmpty() ||
+       ui->lineEdit_storeid->text().isEmpty() )
     {
-        onShowAlert(AlertForm::ERROR, QString::fromLocal8Bit("门店号/账号/密码均不能为空"));
+        onShowAlert(AlertForm::ERROR, QString::fromLocal8Bit("商户号/门店号/POS编号/账号/密码均不能为空"));
         return ;
     }
 
@@ -166,13 +188,15 @@ void LoginForm::on_pushButton_login_clicked()
 //    map.insert(JSON_STOREID, "1036");
 //    map.insert(JSON_STATIONID, "saas_bf_pos");
 
-    map.insert(JSON_STOREID, "fm10001");
-    map.insert(JSON_STATIONID, "1001");
+    //map.insert(JSON_STOREID, "fm10001");
+    //map.insert(JSON_STATIONID, "1001");
 
     //map.insert(JSON_STOREID, "FM00001");
     //map.insert(JSON_STATIONID, "saas_pos");
     //map.insert(JSON_STATIONID, "FM00001");
 
+    map.insert(JSON_STOREID, ui->lineEdit_storeid->text());
+    map.insert(JSON_STATIONID, ui->lineEdit_posno->text());
     map.insert(JSON_KEY_USERID, ui->lineEdit_account->text());
     map.insert(JSON_KEY_PWD, ui->lineEdit_pwd->text());
     map.insert(JSON_KEY_PARTNERID, ui->lineEdit_partnerid->text());

takeout/view/loginform.h

@@ -39,6 +39,7 @@ private slots:
 
     void on_pushButton_close_clicked();
 
+    void SetStoreInfo();
 private:
     Ui::LoginForm *ui;
 
@@ -48,7 +49,6 @@ private:
 
     // 通知窗口
     AlertForm *m_alertForm;
-
 };
 
 #endif // LOGINFORM_H