Add 1:新增自提单核销

fmTakeaway/Control/flowControl.cpp

@@ -176,6 +176,12 @@ bool FlowControl::_PullOrder()
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
 
+                    // 如果是自提单则自动变为送出状态（方便自提单只做完成动作）
+                    if(orderObject->order_type == 3 && orderObject->status ==2 )
+                    {
+                        orderObject->status =4;
+                    }
+
                     emit changeOrderStatus(orderObject);
 
                     if(!Orderstatus::getInstance().isorderexit(orderId))
@@ -205,12 +211,20 @@ bool FlowControl::_PullOrder()
                     }
                 }else
                 {
+                    // 如果是自提单则自动变为送出状态（方便自提单只做完成动作）
+                    if(orderObject->order_type == 3 && orderObject->status ==2 )
+                    {
+                        orderObject->status =4;
+                    }
+
                     //旧数据有更新
                     int oldStatus = orderObject->status;
                     orderObject->FromJson(jsonObject);
+
                     QLOG_INFO() << QString("\r\n\r\n old order[%1:%2].[data:%3]")
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
+
                     if(oldStatus != orderObject->status)
                     {
                         emit changeOrderStatus(orderObject, oldStatus);
@@ -253,7 +267,7 @@ bool FlowControl::_PullOrder()
                     {
                         QLOG_INFO() << QString("will entry %1").arg(orderObject->order_id);
                         //TODO
-                        QTimer::singleShot(1000*60*60, [orderObject, this](){
+                        QTimer::singleShot(1000*60*60*2, [orderObject, this](){
                               QLOG_INFO() << QString("订单[%1]进入队列").arg(orderObject->order_id);
                               m_mutex.lock();
                               m_billList.append(orderObject);
@@ -573,6 +587,25 @@ bool FlowControl::_CompleteOrder(const QString& orderId)
         {
             emit showAlert(AlertForm::SUCCESS, "完成成功!");
 
+            if(m_ordersMap.value(orderId)->order_type == 3)
+            {
+                // 打印
+                QLOG_INFO() << QString("[---begin print---]");
+                QSettings tmpIni(QString("%1/%2").arg(QApplication::applicationDirPath()).arg("printerConfig_tmp.ini"), QSettings::IniFormat);
+                int num = tmpIni.value(QString("%1/num").arg(m_ordersMap.value(orderId)->channel), 1).toInt();
+                for(int i=0; i<num; i++)
+                {
+                    if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), m_ordersMap.value(orderId)))
+                    {
+                        QLOG_INFO() << QString("print sucessful");
+                        Orderstatus::getInstance().printupdate(orderId,1);
+                    }else
+                    {
+                        emit showAlert(AlertForm::ERROR, QString("打印冲突，请稍后手动打印或重启收银程序"));
+                        QLOG_INFO() << QString("print failed");
+                    }
+                }
+            }
             // 通知主界面移动订单
             OrderObject *orderObject = m_ordersMap.value(orderId);
             int oldStatus = orderObject->status;

fmTakeaway/Model/orderObject.cpp

@@ -19,6 +19,16 @@ void OrderObject::FromJson(const QJsonObject &json)
     return;
 }
 
+int OrderObject::getorder_type() const
+{
+    return order_type;
+}
+
+void OrderObject::setorder_type(const int &v)
+{
+    order_type = v;
+}
+
 QString OrderObject::getorder_view_id() const
 {
     return order_view_id;

fmTakeaway/Model/orderObject.h

@@ -61,6 +61,7 @@ public:
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
     Q_PROPERTY (QStringList dis_desc READ getdis_desc WRITE setdis_desc)
     Q_PROPERTY (QString order_view_id READ getorder_view_id WRITE setorder_view_id)
+    Q_PROPERTY (int order_type READ getorder_type WRITE setorder_type)
 
     QString order_view_id;  //用户看到的订单ＩＤ
     QString address;         //地址
@@ -107,9 +108,14 @@ public:
 
     bool bAppointSender;    //是否指定过配送员
 
+    int order_type;          //订单类型
+
     QPushButton* curt_table_btn; //当前订单所在表对应的按钮
 
 protected:
+    int getorder_type() const;
+        void setorder_type(const int& v);
+
     QString getorder_view_id() const ;
     void setorder_view_id(const QString& v);
 

fmTakeaway/mainForm.cpp

@@ -89,6 +89,8 @@ void MainForm::MyShow()
     connect(m_resultForm, &QListWidget::itemClicked, this, &MainForm::onSearchResultItemClicked);
 
     emit flowStart();
+
+    ui->mainEdtSearch->setFocus();
     return;
 }
 
@@ -221,6 +223,14 @@ void MainForm::onShowSearchOrderResult(const QStringList &orderIdList)
         m_resultForm->hide();
         return;
     }
+    if(orderIdList.count()==1)
+    {
+        emit getOrderDetails(orderIdList.at(0));
+        m_resultForm->clear();
+        m_resultForm->hide();
+        m_padForm->hide();
+        ui->mainEdtSearch->clear();
+    }
     m_resultForm->clear();
     m_resultForm->addItems(orderIdList);
     m_resultForm->show();
@@ -238,6 +248,7 @@ void MainForm::onshow()
         m_bShowSelfDeli = false;
     }
 
+    ui->mainEdtSearch->setFocus();
 }
 
 void MainForm::_RevertBtnTable()
@@ -461,6 +472,11 @@ void MainForm::on_mainEdtSearch_clicked()
     m_padForm->show();
 }
 
+void MainForm::on_mainEdtSearch_returnPressed()
+{
+
+}
+
 void MainForm::onNumClicked(const QString &num)
 {
     ui->mainEdtSearch->setText(ui->mainEdtSearch->text().append(num));

fmTakeaway/mainForm.h

@@ -187,6 +187,11 @@ private slots:
      * 返回:NULL
      * */
     void on_mainEdtSearch_clicked();
+    /* 功能:搜索框回车事件
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void on_mainEdtSearch_returnPressed();
     /* 功能:键盘数字点击处理
      * 参数:NULL
      * 返回:NULL