fix bug: 悬浮框遮盖右下角POS系统的按钮；导致系统无法录单

fmTakeout/Control/flowControl.cpp

@@ -1443,7 +1443,7 @@ void FlowControl::_CrondClearExpireOrder()
             QLOG_INFO()<<QString("[<<<<---_CrondClearExpireOrder: ClearExpireOrder: Emit Signal:Clear Order  orderID:%1--->>>>]").arg(order->id);
             emit clearorder(order->id,order->orderStatus);
             m_FmOrdersMap.value(order->id)->deleteLater();
-            // 任何情况情况下都不能清理 Simphony获取的有效队列【除非已经被simphony处理过的数据】；
+            // 任何情况情况下都不能清理 Simphony获取的有效队列【除非已经被simphony处理过的数据】;目前已经在POS 触发的Action1:_ResponseSimReqFristOrderData 中做数据清理了
             // m_simValidOrdersList.removeOne(order->id);
             delete m_FmOrdersMap.take(order->id);
         }
@@ -1922,6 +1922,13 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
         QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---Simphony_Script请求[ACTION:01:]FMOMS已登录，且有订单待拉取:orderId:%1--->>>>>]").arg(orderId);
 
         OrderObject* orderObject = m_FmOrdersMap.value(orderId);
+        if(!orderObject){
+            error = QString::fromLocal8Bit("Delivery Order had been clear by _CrondClearExpireOrder.");
+            m_OrderEntryMutex.lock();
+            m_simValidOrdersList.removeFirst();
+            m_OrderEntryMutex.unlock();
+            result = false;
+        }
         if(MAXPUTTIMES==orderObject->pushOrderTimes) {
             orderObject->pushOrderTimes = 0;
         } else {

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2018,913,1
-    PRODUCTVERSION 2,2018,913,1
+    FILEVERSION 2,2018,919,1
+    PRODUCTVERSION 2,2018,919,1
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "Delivery Order Plug-in"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "2.2018.913.1"
-                VALUE "FileVersion", "2.2018.913.1"
+                VALUE "ProductVersion", "2.2018.919.1"
+                VALUE "FileVersion", "2.2018.919.1"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -9,7 +9,8 @@
 //#define APP_VERSION             "2.20180822.01"
 //#define APP_VERSION             "2.20180824.01"
 //#define APP_VERSION             "2.20180905.01"
-#define APP_VERSION               "2.2018913.1"
+//#define APP_VERSION               "2.2018913.1"
+#define APP_VERSION               "2.2018919.1"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号