更新资源文件

fmPlugin/fmPlugin.cpp

@@ -124,37 +124,37 @@ bool FmPlugin::DoOrderEntry(const OrderObject *orderObject, const QString &cashi
         m_db.close();
         return false;
     }
-    // 插入三张临时表有一个失败则回滚
+    // 插入三张临时表后执行存储过程有一个失败则回滚
     if(!_InsertInto_d_t_food_fmbill0(cashierId, cashierName, shiftId, shiftName))
     {
         error = m_db.lastError().text();
-        m_db.close();
         m_db.rollback();
+        m_db.close();
         return false;
     }
     if(!_InsertInto_d_t_food_fmbills0())
     {
         error = m_db.lastError().text();
-        m_db.close();
         m_db.rollback();
+        m_db.close();
         return false;
     }
     if(!_InsertInto_d_t_bill_fmpay0())
     {
         error = m_db.lastError().text();
-        m_db.close();
         m_db.rollback();
+        m_db.close();
         return false;
     }
-    // 三张临时表都成功则提交
-    m_db.commit();
-
     if(!_Exec_pr_fmwm())
     {
         error = m_db.lastError().text();
+        m_db.rollback();
         m_db.close();
         return false;
     }
+    // 都成功则提交
+    m_db.commit();
 
     error = QString("success");
     m_db.close();
@@ -271,12 +271,17 @@ bool FmPlugin::_InsertInto_d_t_bill_fmpay0()
 bool FmPlugin::_Exec_pr_fmwm()
 {
     QSqlQuery query = QSqlQuery(m_db);
-    query.prepare("exec pr_fmwm ?, 1;");
+    query.prepare("exec pr_fmwm ?, ? output;");
     query.bindValue(0, m_orderObject->order_id);
+    query.bindValue(1, 0, QSql::Out);
     if(!query.exec())
     {
         return false;
     }
+    if(query.boundValue(1).toInt() != 1)
+    {
+        return false;
+    }
     return true;
 }
 

fmPlugin/fmPlugin.h

@@ -20,7 +20,6 @@ public:
      * */
     bool ConnectDb(const QString& host, const QString& username, const QString& password,
                    const QString& dbname, QString& error);
-
     /* 功能:获取门店信息
      * 参数:[1]门店编号[2]收银机编号[3]收银员编号[4]营业日[5]错误
      * 返回:是否成功

fmTakeaway/Control/flowControl.cpp

@@ -9,6 +9,8 @@
 #include <QJsonDocument>
 #include <QJsonArray>
 #include <QTimer>
+#include <QDir>
+#include <QApplication>
 
 FlowControl &FlowControl::GetInstance()
 {
@@ -225,10 +227,29 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
         }else
         {
             OrderObject *orderObject = m_ordersMap.value(orderId);
+
+            emit showAlert(AlertForm::LOADING, "正在写入销售单......");
+            QString orderEntryError("");
+            // 写入销售单
+            if(!FmPlugin::GetInstance().DoOrderEntry(orderObject, m_cashierObject.id, m_cashierObject.name,
+                                                 m_cashierObject.shiftId, m_cashierObject.shiftName, error))
+            {
+                QString dirPath = QString("%1/orders").arg(QApplication::applicationDirPath());
+                QDir dir;
+                dir.mkdir(dirPath);
+                QFile file(QString("%1/%2").arg(dirPath, orderObject->order_id));
+                if(!file.exists())
+                {
+                    file.open(QFile::WriteOnly);
+                    file.close();
+                }
+                orderEntryError = QString("\r\n[<font color='#ff0000'>写入销售单失败,可在订单详情页补录.</font>]");
+            }
+
             QString remark(orderObject->remark), deliveryTime;
             remark = remark.isEmpty()? "" : QString("\r\n[备注: %1]").arg(remark);
             deliveryTime = QString("\r\n[期望送达时间: %1]").arg(orderObject->delivery_time);
-            emit showAlert(AlertForm::SUCCESS, QString("接单成功!%1%2").arg(remark).arg(deliveryTime));
+            emit showAlert(AlertForm::SUCCESS, QString("接单成功!%1%2%3").arg(remark).arg(deliveryTime).arg(orderEntryError));
 
             // 通知主界面移动订单
             int oldStatus = orderObject->status;

fmTakeaway/fmTakeaway.pro

@@ -16,6 +16,9 @@ TEMPLATE = app
 INCLUDEPATH += ../fmPlugin
 INCLUDEPATH += ../fmPrinter
 
+#TODO
+DEFINES += WITHOUT_DATABASE
+
 SOURCES += main.cpp\
         mainForm.cpp \
     alertForm.cpp \

run/printformat.txt

+%1
+%2
+订单编号： %3
+支付方式： [%4]
+客户姓名： %5
+客户电话： %6
+客户地址： %7
+*******************************
+品名  数量  单价  金额
+%8*******************************
+商品金额：￥%9 
+商品优惠：￥%10
+运费金额：￥%11
+总件数：   %12
+%13 
+*******************************
+下单时间: %14
+备注：%15
+配送员: %16
+电话: %17
+送达时间: %18
+老乡鸡安徽快餐领先品牌
+
+
+
+
+

run/skin/make.bat

+rcc -binary deaufult.qrc -o ../../../build/takeaway-Debug/fmTakeaway/debug/skin/deaufult.rcc
+pause
\ No newline at end of file

run/skin/src/make.bat

-rcc -binary deaufult.qrc -o ../deaufult.rcc
\ No newline at end of file

run/userConfig.ini

@@ -8,7 +8,7 @@ database=lxjpos
 name=Fax
 
 [Float]
-postion=@Point(1356 343)
+postion=@Point(197 621)
 opacity=0.5
 blinkInterval=0.3
 soundInterval=2