fix bug: 实现配料传递到 pos，开启拒单时，选择商品不足的商品

fmTakeout/Control/flowControl.cpp

@@ -259,6 +259,21 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
     QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis-> orderObject->orderStatus:--->>>>]")<<orderObject->orderStatus;
     switch (orderObject->orderStatus){
     case OrderObject::NewOrder:
+        if(!orderObject->isPush)
+        {
+            orderObject->pushOrderType = 1;
+            orderObject->pushOrderTimes = 0;
+            m_OrderEntryMutex.lock();
+            if(!m_simValidOrdersList.contains(orderObject->id))
+            {
+                m_simValidOrdersList.append(orderObject->id);
+            }
+            m_OrderEntryMutex.unlock();
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:NewOrder  m_simValidOrdersList.num:%1 --->>>>]")<< m_simValidOrdersList.count();
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:NewOrder  m_simValidOrdersList:%1 --->>>>]")<< m_simValidOrdersList;
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:NewOrder  _ClickOMSAssignArea --->>>>]");
+            _ConfirmOrder(orderObject->id); //新单过来后自动接单；
+        }
         break;
     case OrderObject::Confirmed:
         if(!orderObject->isPush)

fmTakeout/Model/dishesObject.cpp

 #include "dishesObject.h"
+#include "preDefine.h"
 #include <QJsonArray>
 
 
@@ -48,7 +49,7 @@ void dishesObject::FetchDataFromJson(const QJsonObject &json)
 
     qDeleteAll(sub_products);
     sub_products.clear();
-    QJsonArray subDishesArray = json["sub_products"].toArray();
+    QJsonArray subDishesArray = json[JSON_SUBPRODUCTS].toArray();
     foreach(QJsonValue subDish, subDishesArray)
     {
         dishesObject *item = new dishesObject(this);

fmTakeout/preDefine.h

@@ -70,6 +70,7 @@
 #define JSON_ORDERS             "orders"
 #define JSON_COUNT              "count"
 #define JSON_PRODUCTS           "products"
+#define JSON_SUBPRODUCTS        "addExtra"
 #define JSON_ID                 "id"
 #define JSON_ORDERID            "orderId"
 #define JSON_ORDER_ID            "order_id"

fmTakeout/refuseForm.cpp

@@ -52,19 +52,19 @@ void RefuseForm::on_reason1_toggled(bool checked)
 void RefuseForm::on_reason2_toggled(bool checked)
 {
     //TODO
-//    if(m_orderObject!=NULL&&checked)
-//    {
-//        m_refDishesForm->InitData(m_orderObject);
-//        if(QDialog::Accepted == m_refDishesForm->exec())
-//        {
-//            ui->refuseBtnOk->setEnabled(true);
-//            m_reasonCode="菜品已售完";
-//            on_refuseBtnOk_clicked();
-//        }else
-//        {
-//            _Init();
-//        }
-//    }
+    if(m_orderObject!=NULL&&checked)
+    {
+        m_refDishesForm->InitData(m_orderObject);
+        if(QDialog::Accepted == m_refDishesForm->exec())
+        {
+            ui->refuseBtnOk->setEnabled(true);
+            m_reasonCode="菜品已售完";
+            on_refuseBtnOk_clicked();
+        }else
+        {
+            _Init();
+        }
+    }
     if(checked)
     {
         ui->refuseBtnOk->setEnabled(true);