<1> 缺陷修复：重打印订单小票异常缺陷修复；

V2.2023.7.24

fmTakeout/Control/flowControl.cpp

@@ -430,8 +430,7 @@ void FlowControl::_SmartTriggerClickPosBtn(const bool bTimerTrigger)
 
 void FlowControl::_ClickToNotifySimPullOrder()
 {
-    QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---触发按钮点击事件：_ClickToNotifySimPullOrder: m_simValidOrdersList.isEmpty()==%1--->>>>>]")
-                 .arg(m_simValidOrdersList.isEmpty());
+    QLOG_INFO()<<QString("[<<<<---_ClickToNotifySimPullOrder: m_simValidOrdersList.isEmpty()==%1--->>>>>]").arg(m_simValidOrdersList.isEmpty());
     if(!m_simValidOrdersList.isEmpty())
     {
         m_notifySimPullTimer->start(1000*7);
@@ -448,7 +447,7 @@ void FlowControl::_ClickToNotifySimPullOrder()
         if ( m_blockInputPosWarnningTimer->isActive() ) {
             m_blockInputPosWarnningTimer->stop();
         }
-        m_notifySimPullTimer->start(1000*20);
+        m_notifySimPullTimer->start(1000*60);
     }
 }
 
@@ -794,8 +793,10 @@ void  FlowControl::_ReprintOrderTickets(OrderObject* order_p) {
         if ( 3 == syncDbSuccessNum ) {
             if ( PrintMsgQueueDB::getInstance().isOrderPrtMsgExist(order_p) ) {
                 // 针对补打场景: 如果订单打印记录存在则需重置订单各种打印小票的 打印状态;
-                PrintMsgQueueDB::getInstance().resetPrintMsgStatus(order_p, order_p->printOpt );
+                bool retReprint = PrintMsgQueueDB::getInstance().resetPrintMsgStatus(order_p, order_p->printOpt );
+                if ( retReprint ) {
                     syncDbSuccessNum++;
+                }
                 // 销售单/退货单: 打印表需存储2份数据(退货记录中chk_num值 与 销售记录中chk_num值 不等);
             } else {
                 if ( order_p->skipPrint ) {  // 补单场景: 跳过打印;
@@ -841,7 +842,7 @@ void  FlowControl::_ReprintOrderTickets(OrderObject* order_p) {
             QLOG_ERROR() << QString("[<<<<---_ReprintOrderTickets: orderId: %1  Insert 4 Tables Data Failed, Prepare Report Oms--->>>>]").arg(order_p->id);
             // 由于在落库前就会进行 订单商品有效性进行检查: 落库失败:准备将订单数据落库失败的报文消息汇报给 OMS;
             // <1>检查商品有效: 则是表字段过长导致插入失败,必须向OMS汇报存储情况;
-            errorStorageOrderMsg = QString("Reprint Order Tickets Failed, OrderId: %1 Storage Pos Local DB Error : %2  %3  %4  %5 ").arg(orderId)
+            errorStorageOrderMsg = QString("Reprint Order Tickets Failed, OrderId: %1 Storage/Reset DB Error:%2,%3,%4,%5").arg(orderId)
                     .arg( syncOrderProductTbRet?"":"OrderProductTb ").arg( syncOrderPromotionTbRet?"":"OrderPromotionTb ")
                     .arg( syncOrderSumBillTbRet?"":"OrderSumBillTb ").arg( syncOrderPrtMsgTbRet?"":"OrderPrtMsgTb ");
 
@@ -1828,8 +1829,8 @@ bool FlowControl::_SendHeart()
             emit doUpdateStoreStatus(0, 0, 0, 0, 0, m_existNoAckNotice);  //NetWork Is Error , Refresh Store Default Status;
         }
     } else {
-       QLOG_INFO() << QString("[<<<<---Send Heart Finish: code:%1--->>>>]").arg(recvJson[JSON_LOGINCODE].toInt());
-       if(JSON_STATUSCODE_OK != recvJson[JSON_LOGINCODE].toInt())
+
+        if ( JSON_STATUSCODE_OK != recvJson[JSON_LOGINCODE].toInt())
         {
             result = false;
             m_bLastHeartIsError = true;
@@ -1928,7 +1929,7 @@ bool FlowControl::_QueryAllChannelStoreStatus()
         m_queryStoreStatusErrorCount++;
         // emit setNetStatus(QString::fromLocal8Bit("<font color='#ff0000'>网络不稳定，正在重试</font>"));
     } else {
-       QLOG_INFO() << QString("[<<<<---_QueryAllChannelStoreStatus Finish: code:%1--->>>>]").arg(recvJson[JSON_LOGINCODE].toInt());
+
        if(JSON_STATUSCODE_OK != recvJson[JSON_LOGINCODE].toInt())
        {
             result = false;
@@ -1956,10 +1957,6 @@ bool FlowControl::_QueryAllChannelStoreStatus()
                m_curbsideStoreStatus = recvJson[JSON_CURBSIDE_STORESTS].toInt();
            }
 
-           QLOG_INFO()<<QString("[<<<<---FlowControl::_QueryAllChannelStoreStatus  eleStoreStatus: %1, modStoreStatus: %2 , mopStoreStatus: %3 ,"
-                                " mtModStoreStatus: %4, curbsideStoreStatus:%5, existNoAckNotice:%6 --->>>>]")
-                        .arg(m_eleStoreStatus).arg(m_modStoreStatus).arg(m_mopStoreStatus).arg(m_mtModStoreStatus).arg(m_curbsideStoreStatus).arg(m_existNoAckNotice);
-
            emit doUpdateStoreStatus( m_eleStoreStatus, m_modStoreStatus, m_mopStoreStatus, m_mtModStoreStatus, m_curbsideStoreStatus, m_existNoAckNotice );
        }
     }

fmTakeout/DTools/printMsgQueueDB.cpp

@@ -276,7 +276,7 @@ bool PrintMsgQueueDB::resetPrintMsgStatus(const OrderObject* orderObj, const QJs
     // 全部小票;
     if ( printAll ) {
 
-        preExeSql = QString("update tb_print_msr_customer set  print_status=0,  reserve0=0, reserve1=0, reserve6=0, create_datetime=%2  where order_id='%1' ")
+        preExeSql = QString("update tb_print_msr_customer set  print_status=0,  reserve0=0, reserve1=0, reserve6=0, create_datetime='%2'  where order_id='%1' ")
                 .arg(orderObj->id).arg(createTime);
 
         preExeSqlAnother  = QString("update tb_main_prod_refinfo set  prod_resv1=0 where order_id='%1' ").arg(orderObj->id);
@@ -284,7 +284,7 @@ bool PrintMsgQueueDB::resetPrintMsgStatus(const OrderObject* orderObj, const QJs
         // 非全部小票;
     } else {
 
-        preExeSql = QString("update tb_print_msr_customer set create_datetime=%1, ").arg(createTime);
+        preExeSql = QString("update tb_print_msr_customer set create_datetime='%1', ").arg(createTime);
 
         if ( printSummary ) { // 汇总小票
             preExeSql += QString(" print_status=0 ");

fmTakeout/floatForm.cpp

@@ -261,7 +261,6 @@ void FloatForm::onUpdateStoreStatus(int eleStoreStatus, int modStoreStatus, int
 
 
 void FloatForm::RefreshStoreStatus(){
-    QLOG_INFO()<<QString("[<<<----FloatForm::RefreshStoreStatus:--->>>>]");
     int titleLab_w = 30, titleLab_h = 18,  statusLab_w = 30, statusLab_h = 18;
     int first_x = 4, first_y = 25 ;
     this->ui->storeStatusWdg->move(first_x, first_y);

fmTakeout/fmTakeout.rc

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

fmTakeout/preDefine.h

@@ -48,7 +48,8 @@
 //#define APP_VERSION               "2.2022.11.30"
 //#define APP_VERSION               "2.2023.2.23"
 //#define APP_VERSION               "2.2023.4.12"
-#define APP_VERSION               "2.2023.6.29"
+//#define APP_VERSION               "2.2023.6.29"
+#define APP_VERSION               "2.2023.7.24"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"