Version 2.2020.6.20

1、将POS 开单时间 精确到s; 通过DLL 同步到插件，进行插库处理;

fmTakeout/Control/flowControl.cpp

@@ -1926,6 +1926,7 @@ bool FlowControl::_ResponseSimphony04Request(const QJsonObject &content, QJsonOb
     if(m_bLoginResult&&content.contains("orderId")){
         QString orderId=content["orderId"].toString();
         QString posCheckNo=content["posSaleId"].toString();
+
         if(posCheckNo.isEmpty()) {
             posCheckNo=m_orderIdToPosCheckNoMap.value(orderId);
         }
@@ -2065,6 +2066,8 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
     if(m_bLoginResult&&content.contains("orderId")){
         QString orderId=content["orderId"].toString();
         QString posCheckNo=content["posSaleId"].toString();
+        QString posCheckTime=content["posCheckTime"].toString();
+
         if(posCheckNo.isEmpty())
         {
             error=QString::fromLocal8Bit("Request Action05: %1 Delivery Order: Check Num Can't Empty").arg(orderId);
@@ -2101,7 +2104,7 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
                     retSyncOrderPrintInfo = 1;
                 } /*****POS本地数据库不存在 orderId &&posCheckNo*********/
                 else{
-                    bRet = PrintSumBillPosDB::getInstance().insertOrderSumBill(order_p,posCheckNo);
+                    bRet = PrintSumBillPosDB::getInstance().insertOrderSumBill(order_p, posCheckNo, posCheckTime);
                     if (bRet){
                       retSyncOrderPrintInfo = 1;
                     }

fmTakeout/DTools/printSumBillPosDB.cpp

@@ -527,7 +527,7 @@ PrintSumBillPosDB &PrintSumBillPosDB::getInstance()
     return printSumBillPosDB;
 }
 
-bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& posCheckNo){
+bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj, const QString& posCheckNo, const QString& posCheckTime){
     QMutexLocker mutex(&m_mutex);
     if(!m_sqlDb.open()) {
         QLOG_ERROR()<<"[<<<<---SqlServer Database:Open Failed--->>>>]"<<m_sqlDb.lastError().text();
@@ -552,8 +552,13 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
     }else{ temp_customerSex = ""; }
     query.addBindValue(temp_customerSex); // --顾客-性别
     query.addBindValue(0); // --顾客-生日
+
     QDateTime qdaTi = QDateTime::currentDateTimeUtc();
-    query.addBindValue(qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss")); // --POS出小票时间
+    QString posCheckOpenTime  = posCheckTime.length()?
+                qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd ") + posCheckTime : qdaTi.addSecs(60*60*8).toString("yyyy-MM-dd hh:mm:ss");
+
+    query.addBindValue(posCheckOpenTime); // --POS开单时间
+
     query.addBindValue(FlowControl::GetInstance()._GetCashierId()); // --订单处理者
     query.addBindValue(""); // --变更订单时间 //??????????????????????????????????????????
     query.addBindValue(""); // --变更订单作者 [*****后期更新*****]

fmTakeout/DTools/printSumBillPosDB.h

@@ -55,7 +55,7 @@ public:
     *参数:[1]订单号 [2]小票号
     *返回:true操作成功，false失败
     **/
-    bool insertOrderSumBill(OrderObject* orderObj, const QString& posCheckNo);
+    bool insertOrderSumBill(OrderObject* orderObj, const QString& posCheckNo, const QString& posCheckTime);
 
     /**
     *功能: 根据订单对象指针  同步pos本地数据库中数据;

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2020,5,26
-    PRODUCTVERSION 2,2020,5,26
+    FILEVERSION 2,2020,6,20
+    PRODUCTVERSION 2,2020,6,20
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "Delivery Order Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "2.2020.5.26"
-                VALUE "FileVersion", "2.2020.5.26"
+                VALUE "ProductVersion", "2.2020.6.20"
+                VALUE "FileVersion", "2.2020.6.20"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -26,7 +26,8 @@
 //#define APP_VERSION               "2.2019.916.2"
 //#define APP_VERSION               "2.2020.26.1"
 //#define APP_VERSION               "2.2020.312.1"
-#define APP_VERSION               "2.2020.5.26"
+//#define APP_VERSION               "2.2020.5.26"
+#define APP_VERSION               "2.2020.6.20"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号