fix bug: sku是短key 向OMS汇报；过滤培训模式；顾客立刻下单后被立即取消，没有录入退货单；

fmTakeout/Control/flowControl.h

@@ -334,6 +334,14 @@ private slots:
      * */
     void _ReportOMSRecordOrderInfo();
 
+
+    /* 功能:往 向OMS汇报POS订单入机状态的队列  添加新项 或 更新队列中数据;
+     * 参数:NULL
+     * 返回:NULL
+     * */
+    void _AddOrUpdateReportOmsList(const QString &orderId,  const QString &channel,  const QString &repType, const QString &status, const QString &error);
+
+
     /* 功能:获取Json对象的字符
      * 参数:NULL
      * 返回:Json字符串

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,312,1
-    PRODUCTVERSION 2,2020,312,1
+    FILEVERSION 2,2020,4,13
+    PRODUCTVERSION 2,2020,4,13
     //*************************************************************************//
     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.312.1"
-                VALUE "FileVersion", "2.2020.312.1"
+                VALUE "ProductVersion", "2.2020.4.13"
+                VALUE "FileVersion", "2.2020.4.13"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -25,7 +25,8 @@
 //#define APP_VERSION               "2.2019.815.1"
 //#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.312.1"
+#define APP_VERSION               "2.2020.4.13"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号