1.增加食其家 2.增加爱森

fmscupd/fmscupd.pro

@@ -2,14 +2,15 @@ include("QsLog/QsLog.pri")
 include("QtService/src/qtservice.pri")
 include("Quazip/quazip.pri")
 
-QT += core network
+QT += core network sql
 QT -= gui
 
 CONFIG += c++11
 
 DEFINES += QUAZIP_STATIC
-DEFINES += SHAN_LIN
-#DEFINES += XIAN_FENG
+#DEFINES += SHIQIJIA
+#DEFINES += SHAN_LIN
+DEFINES += AI_SEN
 #DEFINES += TODAY
 
 TARGET = fmscupd

fmscupd/fmtools.cpp

@@ -2,6 +2,8 @@
 #include "fmdefine.h"
 #include <QJsonObject>
 #include <QJsonDocument>
+#include <QSqlDatabase>
+#include <QSqlQuery>
 #include <QFile>
 
 FmTools &FmTools::GetInstance()
@@ -15,6 +17,40 @@ FmTools::FmTools()
     QString iniPath = QString("%1/%2").arg(QCoreApplication::applicationDirPath(), INIFILE_NAME);
     m_config = new QSettings(iniPath, QSettings::IniFormat);
 
+#ifdef SHIQIJIA
+    QSqlDatabase db = QSqlDatabase::addDatabase("QODBC");
+    QString dsn = QString("DRIVER={Microsoft Access Driver (*.mdb, *.accdb)};FIL={MS Access};DBQ=C:/ZGIT/MST.ACCDB");
+
+    db.setDatabaseName(dsn);
+
+    m_partnerId = "1396";
+    m_keyStoreId = "0000";
+    m_keyPosId = "0000";
+
+    if(db.open())
+    {
+        QSqlQuery query(db);
+        if(query.exec("select SHOP_CD, POS_NO from MST_PSET"))
+        {
+            if(query.next())
+            {
+                m_keyStoreId = query.value(0).toString();
+                m_keyPosId = query.value(1).toString();
+            }
+        }
+        db.close();
+    }
+#endif  
+#ifdef AI_SEN
+    m_partnerId = "1484";
+
+    QSettings reg("HKEY_LOCAL_MACHINE\\SOFTWARE\\Hisensoft Co.Ltd\\FoodPos", QSettings::NativeFormat);
+    QString appDir = reg.value("AppDir").toString();
+
+    m_siIniPath = appDir + "/PosCfg.ini";
+    m_keyStoreId = "POS/ORGCODE";
+    m_keyPosId = "POS/POSNO";
+#endif
 #ifdef SHAN_LIN
     m_partnerId = "1234";
     m_siIniPath = "D:/hspos/PosCfg.ini";
@@ -85,8 +121,14 @@ QByteArray FmTools::GetUpdateData()
     QSettings setting(m_siIniPath, QSettings::IniFormat);
     QJsonObject rObj;
     rObj.insert(JSON_PARTNERID, m_partnerId);
+
+#ifdef SHIQIJIA
+    rObj.insert(JSON_STOREID, m_keyStoreId);
+    rObj.insert(JSON_POSNO, m_keyPosId);
+#else
     rObj.insert(JSON_STOREID, setting.value(m_keyStoreId).toString());
     rObj.insert(JSON_POSNO, setting.value(m_keyPosId).toString());
+#endif
     rObj.insert(JSON_VERSION, GetVersion());
     return QJsonDocument(rObj).toJson(QJsonDocument::Compact);
 }

fmscupd/main.cpp

@@ -6,4 +6,10 @@ int main(int argc, char *argv[])
 {
     FmService service(argc, argv);
     service.exec();
+
+//    QCoreApplication a(argc, argv);
+//    FmControl m_control;
+//    m_control.Start();
+//    return a.exec();
+
 }