Merge branch 'feature/scangetorder' into develop

takeout/preDefine.h

@@ -62,6 +62,7 @@
 #define INI_POSNO               "info/posNo"
 #define INI_PASSWORD            "info/password"
 #define INI_AUTOCONFIRM         "info/autoconfirm"
+#define INI_AUTOLOGIN           "info/autologin"
 #define INI_UIVISIBLE           "Ui/visible"
 
 #define INI_DELEORDERTIMER      "all/dltordertimer"
@@ -321,17 +322,17 @@
 #define PRT_CONF_TYPE           "type"
 #define PRT_CONF_LABELPRTTYPE   "labelprttype"
 #define PRT_CONF_COM            "com"
-#define PRT_CONF_BAUDRATE       "Baudrate"
-#define PRT_CONF_FLOWCONTROL    "FlowControl"
-#define PRT_CONF_DATABITS       "DataBits"
-#define PRT_CONF_PARITY         "Parity"
-#define PRT_CONF_STOPBITS       "StopBits"
-#define PRT_CONF_PAPERWIDTH     "PaperWidth"
+#define PRT_CONF_BAUDRATE       "baudrate"
+#define PRT_CONF_FLOWCONTROL    "flowcontrol"
+#define PRT_CONF_DATABITS       "databits"
+#define PRT_CONF_PARITY         "parity"
+#define PRT_CONF_STOPBITS       "stopbits"
+#define PRT_CONF_PAPERWIDTH     "paperwidth"
 #define PRT_CONF_LPTNAME        "parallel"
-#define PRT_CONF_IP             "IP"
-#define PRT_CONF_NAME           "Name"
+#define PRT_CONF_IP             "ip"
+#define PRT_CONF_NAME           "name"
 #define PRT_CONF_HIGH           "high"
-#define PRT_CONF_WIGTH          "wigth"
+#define PRT_CONF_WIGTH          "width"
 
 #define DEFAULT_STALLS_TIMEOUT  (60*1000)
 

takeout/view/loginform.cpp

@@ -166,7 +166,7 @@ bool LoginForm::event(QEvent *e)
         {
             this->hide();
             onHideAlert();
-            is_login -= true;
+            is_login = true;
             //emit showmainform();
             DEFAULTPOSTEVENT(PosEvent::s_show_mainform, "");
         }

takeout/view/newloginform.cpp

@@ -50,7 +50,11 @@ NewLoginForm::NewLoginForm(QWidget *parent) :
 
     m_alertForm = new AlertForm(this);
 
+    QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
+    m_autologin = QSettings(configfile, QSettings::IniFormat).value(INI_AUTOLOGIN, 0).toInt();
 
+    if(m_autologin)
+        ui->checkBox_2->setChecked(true);
 
     FMApplication::subscibeEvent(this, PosEvent::s_login_status);
     FMApplication::subscibeEvent(this, PosEvent::s_opt_status);
@@ -103,6 +107,8 @@ void NewLoginForm::showfull()
     {
         SetStoreInfo();
         this->showFullScreen();
+        if(m_autologin == 1)
+            on_pushButton_login_2_clicked();
         return ;
     }
 
@@ -163,7 +169,7 @@ bool NewLoginForm::event(QEvent *e)
         {
             this->hide();
             onHideAlert();
-            is_login -= true;
+            is_login = true;
             //emit showmainform();
             DEFAULTPOSTEVENT(PosEvent::s_show_mainform, "");
         }
@@ -180,6 +186,14 @@ void NewLoginForm::GetCurrLineEdit()
 
 void NewLoginForm::on_pushButton_login_2_clicked()
 {
+    QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
+    if(ui->checkBox_2->isChecked())
+        QSettings(configfile, QSettings::IniFormat).setValue(INI_AUTOLOGIN, 1);
+    else
+        QSettings(configfile, QSettings::IniFormat).setValue(INI_AUTOLOGIN, 0);
+
+    QLOG_DEBUG() << "configfile" << configfile;
+
     QVariantMap map;
 
     if(ui->lineEdit_account_2->text().isEmpty() ||
@@ -229,3 +243,4 @@ void NewLoginForm::on_pushButton_close_clicked()
     //emit showfloat();
     DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
 }
+

takeout/view/newloginform.h

@@ -36,10 +36,8 @@ public slots:
 private slots:
     void on_pushButton_login_2_clicked();
     void number_btn_click();
-
     void SetStoreInfo();
     void on_pushButton_close_clicked();
-
 private:
     Ui::NewLoginForm *ui;
 
@@ -49,6 +47,8 @@ private:
 
     // 通知窗口
     AlertForm *m_alertForm;
+
+    int m_autologin;
 };
 
 #endif // NEWLOGINFORM_H

takeout/view/newmainform.cpp

@@ -67,7 +67,7 @@ NewMainForm::NewMainForm(QWidget *parent) :
     qlt->addWidget(_pickform);
     ui->newmainwgt_scan->setLayout(qlt);
 
-    connect(_pickform, &NewPickupForm::showorderinfo, this, &NewMainForm::onPickUpGetOrder);
+    connect(_pickform, &NewPickupForm::showOrderInfo, this, &NewMainForm::onPickUpGetOrder);
 
     connect(_prttypeForm, &PrtTypeForm::BtnClicket, this, &NewMainForm::onPrtTypeChanged);
 
@@ -209,14 +209,14 @@ void NewMainForm::onSerachOrder(const QString &key)
     }
 }
 
-void NewMainForm::onPickUpGetOrder(QString orderid)
+void NewMainForm::onPickUpGetOrder(QString orderid, bool flag)
 {
     OrderObject order;
     if(!PosOrderPool::GetOrderObject(orderid, order))
         return ;
 
     onHideAlert();
-    _detailForm->InitData(&order);
+    _detailForm->InitData(&order, flag);
     _detailForm->show();
 }
 
@@ -827,6 +827,8 @@ void NewMainForm::InsertTableWidget(OrderObject &orderObject)
     pWdg->InitShow(orderObject.order_id, orderObject.status, orderObject.refund_status, orderObject.order_type);
     //pWdg->InitShow(QString::number(orderObject.order_index), orderObject.status, orderObject.refund_status, orderObject.order_type);
 
+    connect(pWdg, &OrderTypeForm::showOrderInfo, this, &NewMainForm::onPickUpGetOrder);
+
     table->setCellWidget(0, 1, pWdg); //订单状态
     QTableWidgetItem *item0 = new QTableWidgetItem(QString(orderObject.channel_name));
     item0->setTextAlignment(Qt::AlignCenter);

takeout/view/newmainform.h

@@ -82,7 +82,7 @@ public slots:
     void onMainTableItemClicked(QTableWidgetItem *item);
     void onSerachOrder(const QString &key);
     void onPrtTypeChanged(int type);
-    void onPickUpGetOrder(QString orderid);
+    void onPickUpGetOrder(QString orderid, bool flag);
 private slots:
     void on_newmainbtn_clicked();
 

takeout/view/newmainform.ui

@@ -270,6 +270,11 @@ QTabWidget#newmaintbwgt QTabBar::tab
 {
 	border:1px solid rgb(230,230,230);
 	border-radius:4px;
+}
+#newmainwgt_scan
+{
+	
+	background-color: rgb(255, 255, 255);
 }</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,7">

takeout/view/newpickupform.cpp

@@ -18,17 +18,9 @@ NewPickupForm::~NewPickupForm()
 
 void NewPickupForm::Initshow()
 {
-    ui->widgetmsg->show();
-    ui->widgetinput->show();
-    ui->widgetok->hide();
-    ui->widgetrlt->hide();
-
-    ui->lineEditpickupcode->show();
-    ui->lineEditpickupcode->clear();
-    ui->labelpickupwar->hide();
-    ui->labelpickupmsg->show();
-    ui->labelpickupmsg->setText(QString::fromUtf8("\xE8\xAF\xB7\xE6\x89\xAB\xE7\xA0\x81\xE7\x94\xA8\xE6\x88\xB7\xE5\x8F\x96\xE9\xA4\x90\xE7\xA0\x81"));
-    ui->lineEditpickupcode->setFocus();
+    ui->newpickuplabel_msg->clear();
+    ui->newpickupline_code->clear();
+    ui->newpickupline_code->setFocus();
     this->show();
 }
 
@@ -38,57 +30,84 @@ void NewPickupForm::keyPressEvent(QKeyEvent *e)
 
     if(e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return)  //判断是否是回车键按下
     {
-        if(ui->lineEditpickupcode->text().isEmpty())
+        ui->newpickuplabel_msg->clear();
+        findOrder();
+        return ;
+    }
+
+    return QWidget::keyPressEvent(e);
+}
+
+void NewPickupForm::findOrder()
+{
+    if(ui->newpickupline_code->text().isEmpty())
     {
-            ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE5\x8F\x96\xE9\xA4\x90\xE7\xA0\x81\xE4\xB8\x8D\xE8\x83\xBD\xE4\xB8\xBA\xE7\xA9\xBA"));
+        ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE5\x8F\x96\xE9\xA4\x90\xE7\xA0\x81\xE4\xB8\x8D\xE8\x83\xBD\xE4\xB8\xBA\xE7\xA9\xBA"));
         return ;
     }
 
     int status = DefaultOrder, refund_status = DefaultOrder;
     bool oldorder;
 
-        if(PosOrderPool::GetOrderStatus(ui->lineEditpickupcode->text(), status, refund_status, oldorder) && refund_status != CompleteRefundOrder && status != CancelOrder)
+    if(PosOrderPool::GetOrderStatus(ui->newpickupline_code->text(), status, refund_status, oldorder) && refund_status != CompleteRefundOrder && status != CancelOrder)
     {
         QLOG_DEBUG() << "*****************:" << status << refund_status;
 
         if(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder)
         {
-                ui->widgetrlt->show();
-                ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE5\xB7\xB2\xE7\x94\xB3\xE8\xAF\xB7\xE9\x80\x80\xE5\x8D\x95\xE7\x9A\x84\xE8\xAE\xA2\xE5\x8D\x95\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE5\x85\x88\xE6\x8B\x92\xE7\xBB\x9D\xE9\x80\x80\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
+            ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE5\xB7\xB2\xE7\x94\xB3\xE8\xAF\xB7\xE9\x80\x80\xE5\x8D\x95\xE7\x9A\x84\xE8\xAE\xA2\xE5\x8D\x95,\xE8\xAF\xB7\xE5\x85\x88\xE6\x8B\x92\xE7\xBB\x9D\xE9\x80\x80\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
             return ;
         }
 
         if(status == NewOrder && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
         {
-                ui->widgetrlt->show();
-                ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE6\x96\xB0\xE8\xAE\xA2\xE5\x8D\x95\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE5\x85\x88\xE6\x8E\xA5\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
+            ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE6\x96\xB0\xE8\xAE\xA2\xE5\x8D\x95,\xE8\xAF\xB7\xE5\x85\x88\xE6\x8E\xA5\xE5\x8D\x95\xE5\x86\x8D\xE5\x8F\x96\xE9\xA4\x90\x21"));
             return ;
         }
 
         if((status == CompleteOrder || status == ServiceOrder) && !(refund_status == ApplicationRefundOrder || refund_status == ApplicationPartialRefundOrder))
         {
-                ui->labelpickupmsg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE5\x8F\xAF\xE8\x83\xBD\xE5\xB7\xB2\xE7\xBB\x8F\xE8\xA2\xAB\xE6\x8B\xBF\xE8\xB5\xB0\x5C\x72\x5C\x6E\xE8\xAF\xB7\xE7\xA1\xAE\xE8\xAE\xA4\xE5\x8F\x96\xE9\xA4\x90\xE7\x94\xA8\xE6\x88\xB7\xE6\x98\xAF\xE5\x90\xA6\xE6\xAD\xA3\xE7\xA1\xAE\x21"));
-                ui->labelpickupwar->show();
-                ui->widgetok->show();
-                ui->widgetmsg->show();
-                ui->labelpickupwar->show();
-                ui->widgetrlt->hide();
-                ui->widgetinput->hide();
+            ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE5\x8F\xAF\xE8\x83\xBD\xE5\xB7\xB2\xE7\xBB\x8F\xE8\xA2\xAB\xE6\x8B\xBF\xE8\xB5\xB0,\xE8\xAF\xB7\xE7\xA1\xAE\xE8\xAE\xA4\xE5\x8F\x96\xE9\xA4\x90\xE7\x94\xA8\xE6\x88\xB7\xE6\x98\xAF\xE5\x90\xA6\xE6\xAD\xA3\xE7\xA1\xAE\x21"));
             return ;
         }
 
         this->hide();
-            emit showorderinfo(ui->lineEditpickupcode->text());
+        emit showOrderInfo(ui->newpickupline_code->text(), true);
     }
     else
     {
         QLOG_DEBUG() << "*****************:" << status << refund_status;
-            ui->widgetrlt->show();
-            ui->labelpickuprltmsg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE4\xB8\x8D\xE5\xAD\x98\xE5\x9C\xA8"));
+        ui->newpickuplabel_msg->setText(QString::fromUtf8("\xE8\xAE\xA2\xE5\x8D\x95\xE4\xB8\x8D\xE5\xAD\x98\xE5\x9C\xA8"));
     }
+}
 
-        return ;
+void NewPickupForm::onNumClicked()
+{
+    QPushButton *btn = (QPushButton*)sender();
+
+    QString num = btn->property("number").toString();
+
+    if(!num.isEmpty())
+    {
+        ui->newpickupline_code->setText(QString(ui->newpickupline_code->text()).append(num));
     }
+}
 
-    return QWidget::keyPressEvent(e);
+void NewPickupForm::on_newpickupbtn_del_clicked()
+{
+    ui->newpickuplabel_msg->clear();
+    QString text = ui->newpickupline_code->text();
+    ui->newpickupline_code->setText(text.left(text.length()-1));
+}
+
+void NewPickupForm::on_newpickupbtn_ok_clicked()
+{
+    ui->newpickuplabel_msg->clear();
+    findOrder();
+}
+
+void NewPickupForm::on_newpickupbtn_clean_clicked()
+{
+    ui->newpickuplabel_msg->clear();
+    ui->newpickupline_code->clear();
 }

takeout/view/newpickupform.h

@@ -18,8 +18,20 @@ public:
     void Initshow();
 
     void keyPressEvent(QKeyEvent *e);
+
+    void findOrder();
+public slots:
+    void onNumClicked();
+
 signals:
-    void showorderinfo(QString pickupid);
+    void showOrderInfo(QString pickupid, bool cpt);
+private slots:
+    void on_newpickupbtn_del_clicked();
+
+    void on_newpickupbtn_ok_clicked();
+
+    void on_newpickupbtn_clean_clicked();
+
 private:
     Ui::NewPickupForm *ui;
 };

takeout/view/ordertypeform.cpp

@@ -22,6 +22,16 @@ OrderTypeForm::~OrderTypeForm()
     delete ui;
 }
 
+void OrderTypeForm::mousePressEvent(QMouseEvent *e)
+{
+    if(e->buttons()&Qt::LeftButton)
+    {
+        emit showOrderInfo(_order_id, false);
+        return ;
+    }
+    return QWidget::mousePressEvent(e);
+}
+
 void OrderTypeForm::InitShow(QString order_id, int order_status, int refund_status, int order_type)
 {
     _order_id = order_id;

takeout/view/ordertypeform.h

@@ -18,6 +18,8 @@ public:
     explicit OrderTypeForm(QWidget *parent = 0);
     ~OrderTypeForm();
 
+    void mousePressEvent(QMouseEvent *e);
+
     void InitShow(QString order_id, int order_status, int refund_status, int order_type);
 
     QString order_id() const;
@@ -31,6 +33,9 @@ public:
     int order_type() const;
 
     void SetNameStyle(int status);
+signals:
+    void showOrderInfo(QString orderid, bool cpt);
+
 private:
     Ui::OrderTypeForm *ui;
     QString _order_id;