修复不能重新录单的问题

Thread/workThread/flowcontroll.cpp

@@ -1215,13 +1215,9 @@ bool flowControll::_RefundOrder(const QString& orderId, QString reason)//退单
         emit showOrderDetails(m_ordersMap.value(orderId));
  }
 
- void flowControll::onReEntryOrder(OrderObject* orderObject,int operation)
+ void flowControll::onReEntryOrder(OrderObject* orderObject)
  {
-     int result;
-     if(operation!=OPERATIONMAME_ENTRY)
-     {
-         return;
-     }
+     qDebug()<<orderObject->status;
      if((orderObject->status!=100&&orderObject->status!=3)&&!Orderstatus::getInstance().isentry(orderObject->order_id))
      {
          if(!DoSalesSlip(orderObject,0))

Thread/workThread/flowcontroll.h

@@ -118,7 +118,7 @@ public slots:
     void onUpdateCashier(const CashierObject& cashier);//更新收银员信息
     void onGetOnDutyCashiers();//获取在班收银员信息
     void onGetOrderDetails(const QString& orderId);//获取订单详情
-    void onReEntryOrder(OrderObject *orderObject, int operation);//本地接受销售单
+    void onReEntryOrder(OrderObject *orderObject);//本地接受销售单
     void onNetReEntryOrder(const QString &orderId);//发送数据到服务端
     void onProcessRejectOrder(const QString& orderId, const int& reason, const int &reasontype);
     bool _RefundOrder(const QString& orderId, QString reason);//退单

Ui/DetailForm.cpp

@@ -214,7 +214,7 @@ void DetailForm::WriteData(/*char data[]*/)
     {
         return;
     }
-        emit reEntryOrder(m_orderObject,btn->property("opertion").toInt());
+        emit reEntryOrder(m_orderObject);
         m_orderObject->mate_assigned=0;
         hide();
 }

Ui/DetailForm.h

@@ -64,7 +64,7 @@ private:
 public:
     Ui::DetailForm *ui;
 
-    Q_SIGNAL    void reEntryOrder(OrderObject* order,int opertion); //补录订单
+    Q_SIGNAL    void reEntryOrder(OrderObject* order); //补录订单
     Q_SIGNAL    void NetreEntryOrder(const QString& orderId);//上传补录
     Q_SIGNAL    void processOrder(const QString& operation, const QString& orderId, const DeliverObject& deliverObj); // 处理订单1pra操作动作名2pra订单编号3pra配送员信息
     Q_SIGNAL    void processRejectOrder(const QString& orderId,const int& reason,const int& reasontype);