fix 调试POS发现日志相关优化

Version: 2.2021.11.5

fmTakeout/Control/flowControl.cpp

@@ -514,18 +514,21 @@ void FlowControl::_StoragePosOrderData() {
                 } else {
                     QLOG_ERROR() << QString("[<<<<---FmTakeout _StoragePosOrderData: orderId: %1  Insert 4 Tables Data Failed, Prepare Report Oms--->>>>]").arg(order_p->id);
                     // 解耦POS标识作为最后标识尺度; 避免后期 解耦和 先打印后存储模式的 同时存在;
+                    // 由于在落库前就会进行 订单商品有效性进行检查: 落库失败:准备将订单数据落库失败的报文消息汇报给 OMS;
+                    // <1>检查商品有效: 则是表字段过长导致插入失败,必须向OMS汇报存储情况;
                     if ( order_p->decouplePosVersion >= 20 ) {
                         errorStorageOrderMsg = QString("Decouple Pos: OrderId: %1 Storage Pos Local DB Error : %2  %3  %4  %5 ").arg(orderId)
                                 .arg( syncOrderProductTbRet?"":"OrderProductTb ").arg( syncOrderPromotionTbRet?"":"OrderPromotionTb ")
                                 .arg( syncOrderSumBillTbRet?"":"OrderSumBillTb ").arg( syncOrderPrtMsgTbRet?"":"OrderPrtMsgTb ");
+
+                         _AddOrUpdateReportOmsList(order_p->id,  order_p->channel, requestType, "4", posCheckNo, errorStorageOrderMsg, QString("1009") );
                     } else {
                         errorStorageOrderMsg = QString("Advance Print SumBill: OrderId: %1 Storage Pos Local DB Error : %2  %3  %4  %5 ").arg(orderId)
                                 .arg( syncOrderProductTbRet?"":"OrderProductTb ").arg( syncOrderPromotionTbRet?"":"OrderPromotionTb ")
                                 .arg( syncOrderSumBillTbRet?"":"OrderSumBillTb ").arg( syncOrderPrtMsgTbRet?"":"OrderPrtMsgTb ");
+
+                         _AddOrUpdateReportOmsList(order_p->id,  order_p->channel, requestType, "2", "", errorStorageOrderMsg, QString("") );
                     }
-                    // 由于在落库前就会进行 订单商品有效性进行检查: 落库失败:准备将订单数据落库失败的报文消息汇报给 OMS;
-                    // <1>检查商品有效: 则是表字段过长导致插入失败,必须向OMS汇报存储情况;
-                    _AddOrUpdateReportOmsList(order_p->id,  order_p->channel, requestType, "4", posCheckNo, errorStorageOrderMsg, QString("1009") );
 
                 }
 

fmTakeout/DTools/checkPoskeyExistPosDB.cpp

@@ -96,6 +96,7 @@ bool CheckPoskeyExistPosDB::allPoskeyExistDB( OrderObject* orderObj , QStringLis
 
     if ( query.numRowsAffected()  == orderObj->posKeyList.size() ) {
         result= true;
+        orderObj->posKeyList.clear();
     } else {
         result = false;
         while( query.next() ) {
@@ -107,13 +108,11 @@ bool CheckPoskeyExistPosDB::allPoskeyExistDB( OrderObject* orderObj , QStringLis
     }
 
     m_sqlDb.close();
-
     notExistPoskeyList = orderObj->posKeyList;
     return result;
 }
 
 
-
 bool CheckPoskeyExistPosDB::queryValue(const QString& orderId, const QString& key, QString& error, QVariant &value){
     QMutexLocker mutex(&m_mutex);
     if(!m_sqlDb.open()) {

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2021,9,24
-    PRODUCTVERSION 2,2021,9,24
+    FILEVERSION 2,2021,11,5
+    PRODUCTVERSION 2,2021,11,5
     //*************************************************************************//
     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.2021.9.24"
-                VALUE "FileVersion", "2.2021.9.24"
+                VALUE "ProductVersion", "2.2021.11.5"
+                VALUE "FileVersion", "2.2021.11.5"
                 //*************************************************************************//
             END
         END