米有交付微调

fmTakeaway/Control/flowControl.cpp

@@ -264,15 +264,14 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
 
             emit showAlert(AlertForm::LOADING, "正在写入销售单......");
             // 写入销售单
-            // TODO
-//            QLOG_INFO() << QString("[---begin entry order---].");
-//            if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error))
-//            {
-//                while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
-//                {
-//                    QLOG_INFO() << QString("entry order failed[%1]").arg(error);
-//                }
-//            }
+            QLOG_INFO() << QString("[---begin entry order---].");
+            if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error))
+            {
+                while(!FmPlugin::GetInstance().DoOrderEntry(orderObject, error, true))
+                {
+                    QLOG_INFO() << QString("entry order failed[%1]").arg(error);
+                }
+            }
             QLOG_INFO() << QString("[entry order success].");
 
             QString remark(orderObject->remark), deliveryTime;

fmTakeaway/mainForm.cpp

@@ -30,7 +30,7 @@ MainForm::MainForm(QWidget *parent) :
     qRegisterMetaType<DeliverObject>("DeliverObject");
     qRegisterMetaType< QList<DeliverObject> >("QList<DeliverObject>");
     qRegisterMetaType<AlertForm::Type>("AlertForm::Type");
-    qRegisterMetaType<QMap<QString,QString>>("QMap<QString,int>");
+    qRegisterMetaType< QMap<QString,QString> >("QMap<QString,int>");
 
     // 连接信号槽
     connect(&m_timeTimer, &QTimer::timeout, this, &MainForm::onSetCurrentTime);

fmTakeaway/preDefine.h

@@ -74,7 +74,7 @@
 #define OPERATIONNAME_SENDOUT       "送出"
 #define OPERATIONNAME_COMPLETE      "完成"
 #define OPERATIONNAME_REFUSEREFUND  "拒绝"
-#define OPERATIONNAME_REFUNDORDER   "同意"
+#define OPERATIONNAME_REFUNDORDER   "退单"
 
 // 属性名称
 #define PROPERTY_ID             "id"            // 人员编号