增加入机功能（书亦烧仙草版本）1、入机时新增平台 2、入机三张表 3、入机失败落本地库

takeout/base/DB/fm_database.cpp

@@ -100,6 +100,7 @@ bool FMDataBase::insert(QString table, QVariantHash data)
 
 bool FMDataBase::insert(QString table, QVariantMap data)
 {
+    QLOG_DEBUG() << "FMDataBase::insert _isopen:" << _isopen;
     if(!_isopen)
         return false;
 
@@ -110,6 +111,7 @@ bool FMDataBase::insert(QString table, QVariantMap data)
     if(!getSql(table, data, columnnamelist, columnvaluelist))
     {
         _db.close();
+        QLOG_DEBUG() << "FMDataBase::insert getSql failed";
         return false;
     }
 

takeout/control/orderentrywork.h

+#ifndef ORDERENTRYWORK_H
+#define ORDERENTRYWORK_H
+
+#include "control/workobject.h"
+#include "view/alertForm.h"
+#include "model/productObject.h"
+#include "model/orderObject.h"
+
+#include <QtSql/QtSql>
+
+//struct XSJBXX_DATA{
+//    QString   BZ;
+//    QString   XSDH;
+//    QString   XH;
+//    QString   DDYBH;
+//    double    JEZJ;
+//    double    ZKJE;
+//    double    ZRJE;
+//    double    YS;
+//    double    SS;
+//    QDateTime DDSJ;
+//    QDateTime JYSJ;
+//    QString   JZFSBM;
+//    QString   ZH;
+//    QString   KHBH;
+//    double    QKJE;
+//    int       WMBS;
+//    QString   BY7;
+//    int       JCRS;
+//};
+
+//struct XSMXXX_DATA{
+//    QString XH;
+//    QString XSDH;
+//    QString XMBH;
+//    QString XMMC;
+//    QString TM;
+//    QString DW;
+//    double  YSJG;
+//    double  XSJG;
+//    double  SL;
+//    double  XSJEXJ;
+//    double  FTJE;
+//    QString SYYXM;
+//    QString SSLBBM;
+//    QString SFXS;
+//};
+
+//struct XSFKFS_DATA{
+//    long    XH;
+//    QString XSDH;
+//    QString BM;
+//    QString NR;
+//    double  FKJE;
+//    int     DYQZS;
+//};
+
+class OrderEntryWork : public WorkObject
+{
+    Q_OBJECT
+public:
+    explicit OrderEntryWork(WorkObject *parent = 0);
+
+    virtual bool event(QEvent *e);
+
+private:
+
+    //连接数据库
+    bool openDatabase();
+
+    //订单入机
+    void orderInput(QString orderid);
+
+    //通过商品名称获取项目编号
+    QString getLBBM(QString LBMC);
+
+    QString getXMBH(QString LBBM);
+
+    QString getXMMC(QString LBBM);
+
+    QString getTM(QString LBBM);
+
+    QString getDW(QString XMBH);
+
+    bool isInserted(QString fm_id);
+
+    bool XHisExisted();
+
+    bool insertYHJBQKtable(QString pl, QString platform);
+
+
+    //插入消费基本信息表
+    bool insertXSJBXXtable(OrderObject order, QString &error);
+    //插入消费明细表
+    bool insertXSMXXXtable(OrderObject order, QString &error);
+    //插入销售付款方式表
+    bool insertXSFKFStable(OrderObject order, QString &error);
+
+private:
+
+    QSqlDatabase m_db;
+
+    int m_index;
+
+    QString m_partnerid;
+};
+
+
+#endif // ORDERENTRYWORK_H

takeout/control/ordergetwork.cpp

@@ -426,6 +426,10 @@ void OrderGetWork::optOrderWithType(const QVariantMap &map)
     if(PosOrderPool::GetOrderObject(orderid, localorder))
         order_type = localorder.order_type;
 
+    //2019/5/6新增需求：接单、退单、同意退款、拒绝退款等操作的请求中加入source字段，source是拉单的channel字段
+    json.insert(JSON_KEY_SOURCE, localorder.channel);
+    QLOG_INFO() << "optOrderWithType request : " << json;
+
     QLOG_DEBUG() << "order type : " << order_type << "opt type : " << type;
 
     OrderGetDataProcess::getRequestType(status, type, order_type);

takeout/control/orderlocalizework.h

- #ifndef ORDERLOCALIZEWORK_H
+#ifndef ORDERLOCALIZEWORK_H
 #define ORDERLOCALIZEWORK_H
 
 #include <QObject>

takeout/main.cpp

@@ -18,6 +18,7 @@
 #include "control/stallsgetwork.h"
 #include "control/networkcheckwork.h"
 #include "control/driverinfogetwork.h"
+#include "control/orderentrywork.h"
 #include "base/Dump/dump.h"
 #include "base/DB/fm_database.h"
 //#include "view/loginform.h"
@@ -184,6 +185,8 @@ int main(int argc, char *argv[])
     orderprintwork printwork;
     //订单数据本地化
     OrderLocalizeWork loac;
+    //订单入机
+    OrderEntryWork entrywork;
     //心跳长良介
     OrderPushWork pwork;
     //预约单打印
@@ -210,6 +213,7 @@ int main(int argc, char *argv[])
     pwork.setSerurl(pushurl);
     //移动子工作流到线程
     loac.moveToThread(&thread, false);
+    entrywork.moveToThread(&thread, false);
     work.moveToThread(&thread, true);
     printwork.moveToThread(&prtthreadt, true);
     pwork.moveToThread(&threadt, true);
@@ -220,6 +224,7 @@ int main(int argc, char *argv[])
 
     stallsgetwork.moveToThread(&stallsThread, true);
     prtmodelgetwork.moveToThread(&prtModelThread, true);
+//    entrywork.moveToThread(&prtModelThread, false);
     driverinfogetwork.moveToThread(&driverInfoThread, true);
     //启动tcp长链接和拉单工作流
     thread.start();

takeout/model/productObject.cpp

@@ -108,3 +108,13 @@ void ProductObject::setProductAmount(const int &v)
 {
     product_amount = v;
 }
+
+QString ProductObject::getstock_barcode() const
+{
+    return stock_barcode;
+}
+
+void ProductObject::setstock_barcode(const QString &v)
+{
+    stock_barcode = v;
+}

takeout/model/productObject.h

@@ -20,6 +20,7 @@ public:
     Q_PROPERTY (int price READ getprice WRITE setprice)
     Q_PROPERTY (int product_amount READ getProductAmount WRITE setProductAmount)
     Q_PROPERTY (int cost READ getcost WRITE setcost)
+    Q_PROPERTY (QString stock_barcode READ getstock_barcode WRITE setstock_barcode)
 
     QString property_tags;
     QString pid;
@@ -27,6 +28,7 @@ public:
     QString upc;
     int price;
     int product_amount;
+    QString stock_barcode;
     QList<ProductObject*> sub_products;//子商品
         int cost;                //是否是优惠卷
 
@@ -55,6 +57,9 @@ protected:
 
     int getProductAmount() const ;
     void setProductAmount(const int &v);
+
+    QString getstock_barcode() const;
+    void setstock_barcode(const QString &v);
 };
 
 #endif // PRODUCTOBJECT_H

takeout/preDefine.h

@@ -14,9 +14,11 @@
 #define DEFAULT_DBNAME              "order.db"
 #define DEFAULT_PRTDBNAME           "prt.db"
 #define DEFAULT_PRTMODEL            "prtmodel.db"
+#define DEFAULT_ENRTYFAILED         "entryfailed.db"
 #define DEFAULT_DBFORM              "orderlist"
 #define DEFAULT_PRTFORM             "prtlist"
 #define DEFAULT_PRTMODELFORM        "prtmodellist"
+#define DEFAULT_ENRTYFAILEDFORM     "entryfailedlist"
 
 #define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
 #define DEFAULT_ACCESS_TOKEN        "3e0e8e1b-ad85-4ec0-a0ec-ad92bb5ae043"
@@ -83,6 +85,7 @@
 #define INI_BASE_USERID         "base/userid"
 #define INI_BASE_PWD            "base/pwd"
 #define INI_BASE_STATIONIID     "base/stationid"
+#define INI_BASE_SERIAL         "base/serial"
 
 #define JSON_REQTYPE            "reqtype"
 #define JSON_CURRENTUSER        "current_user"
@@ -204,6 +207,7 @@
 #define JSON_KEY_REASON             "reason"
 #define JSON_KEY_ORDERSTATUS        "status"
 #define JSON_KEY_REFUNDSTATUS       "refund_status"
+#define JSON_KEY_SOURCE             "source"
 
 #define EVENT_KEY_STATUS            "status"
 #define EVENT_KEY_DRIVER_STATUS     "driver_status"
@@ -425,4 +429,22 @@
 #define CONFIG_CHECKIP_IP                "CheckIP/ip"
 #define CONFIG_CHECKIP_INDEX             "CheckIP/index"
 
+//入机所需字段
+#define XSJBXX_DDYBH_MT                  "美团外卖平台"
+#define XSJBXX_DDYBH_ELM                 "饿了么平台"
+#define XSJBXX_DDYBH_BD                  "百度外卖平台"
+#define XSJBXX_DDYBH_JDDJ                "京东到家平台"
+#define XSJBXX_DDYBH_SAAS                "开个店平台"
+#define WAISONG                          "外送"
+#define XSJBXX_BY7_MT                    "美团外卖平台订单 "
+#define XSJBXX_BY7_ELM                   "饿了么平台订单 "
+#define XSJBXX_BY7_BD                    "百度外卖平台订单 "
+#define XSJBXX_BY7_JDDJ                  "京东到家平台订单 "
+#define XSJBXX_BY7_SAAS                  "开个店平台订单 "
+#define XSFKFS_BM_MT                     "美团外卖"
+#define XSFKFS_BM_ELM                    "饿了么外卖"
+#define XSFKFS_BM_BD                     "百度外卖"
+#define XSFKFS_BM_JDDJ                   "京东到家"
+#define XSFKFS_BM_SAAS                   "开个店"
+
 #endif // PREDEFINE_H

takeout/takeout.pro

@@ -21,7 +21,7 @@ LIBS += -L$$PWD/lib -llibeay32 -lssleay32 -lwinspool
 LIBS += -lWs2_32
 LIBS += -lDbghelp
 
-DEFINES += USE_QAACTION
+#DEFINES += USE_QAACTION
 DEFINES += FM_NEW_UI
 
 #DEFINES += FM_TEST
@@ -87,7 +87,8 @@ SOURCES += \
     $$PWD/base/Arithmetic/cretopt.cpp \
     $$PWD/control/driverinfogetwork.cpp \
     $$PWD/view/newfloatform.cpp \
-    view/frminput.cpp
+    view/frminput.cpp \
+    control/orderentrywork.cpp
 
 HEADERS  += \
     $$PWD/event/fmapplication.h \
@@ -148,7 +149,8 @@ HEADERS  += \
     $$PWD/view/newchangeshiftsform.h \
     $$PWD/control/driverinfogetwork.h \
     $$PWD/view/newfloatform.h \
-    view/frminput.h
+    view/frminput.h \
+    control/orderentrywork.h
 
 DISTFILES += $$PWD/takeout.rc