完善鲜丰写销售单(完成)

fmTakeaway/Control/flowControl.cpp

@@ -205,7 +205,9 @@ bool FlowControl::_PullOrder()
                         emit changeOrderStatus(orderObject, oldStatus);
                     }
                 }
-                if(orderObject->status != 1 && orderObject->status != 2 && orderObject->delivery_status==3)
+                if(orderObject->status == 4 || orderObject->status == 5
+                        || orderObject->status == 6
+                        || orderObject->status == 200)
                 {
                     QString error;
                     if(FmPlugin::GetInstance().DoOrderEntry(orderObject,"","","","",error))

fmTakeaway/mainForm.cpp

@@ -234,6 +234,7 @@ void MainForm::onshow()
     {
         m_alertForm->SetContent(AlertForm::ERROR, QString("部分订单没有骑士配送!已转移至自配送栏目"));
         m_alertForm->show();
+        ui->mainBtnOur->click();
         m_bShowSelfDeli = false;
     }
 
@@ -425,6 +426,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
        {
            m_alertForm->SetContent(AlertForm::ERROR, QString("[%1][%2]号订单[%3]没有骑士配送!已转移至自配送栏目").arg(orderObject->channelName).arg(orderObject->order_index).arg(orderObject->order_id));
            m_alertForm->show();
+           ui->mainBtnOur->click();
        }
     }
 

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-03-13T15:43:32. -->
+<!-- Written by QtCreator 4.0.0, 2017-03-14T17:30:08. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>