fix bug:

    <1>门店营业状态显示
    <2>避免重装系统导致门店当天全部订单重复入机；

fmTakeout/Model/orderObject.h

@@ -69,6 +69,8 @@ class OrderObject : public QObject
     Q_PROPERTY (int productPrice READ getProductPrice WRITE setProductPrice)
     Q_PROPERTY (int totalPrice READ getTotalPrice WRITE setTotalPrice)
     Q_PROPERTY (int orderStatus READ getOrderStatus WRITE setOrderStatus)
+    Q_PROPERTY (int forwardPosStatus READ getForwardPosStatus WRITE setForwardPosStatus)
+    Q_PROPERTY (int negativePosStatus READ getNegativePosStatus WRITE setNegativePosStatus)
     Q_PROPERTY (int deliveryStatus READ getDeliveryStatus WRITE setDeliveryStatus)
     Q_PROPERTY (int payStatus READ getPayStatus WRITE setPayStatus)
     Q_PROPERTY (int refundStatus READ getRefundStatus WRITE setRefundStatus)
@@ -161,6 +163,8 @@ public:
     int productPrice;
     int totalPrice;
     int orderStatus;
+    int forwardPosStatus;  // 正向单入机状态： 0:未知  1: 成功  2:失败;
+    int negativePosStatus;  // 负向单同上;
     int deliveryStatus;
     int payStatus;
     int refundStatus;
@@ -350,6 +354,12 @@ public:
     inline int getOrderStatus()const{return orderStatus;}
     inline void setOrderStatus(const int& v){orderStatus = v;}
 
+    inline int getForwardPosStatus()const{return forwardPosStatus;}
+    inline void setForwardPosStatus(const int& v){forwardPosStatus = v;}
+
+    inline int getNegativePosStatus()const{return negativePosStatus;}
+    inline void setNegativePosStatus(const int& v){negativePosStatus = v;}
+
     inline int getDeliveryStatus()const{return deliveryStatus;}
     inline void setDeliveryStatus(const int& v){deliveryStatus = v;}
 

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2019,1125,1
-    PRODUCTVERSION 2,2019,1125,1
+    FILEVERSION 2,2019,1224,1
+    PRODUCTVERSION 2,2019,1224,1
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -27,12 +27,12 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "CompanyName", "ShangHai.Freemud Co., Ltd."
                 VALUE "FileDescription", "Delivery Order Plugin Application"
                 VALUE "InternalName", "fmTakeout.exe"
-                VALUE "LegalCopyright", "Copyright (C)2013-2019"
+                VALUE "LegalCopyright", "Copyright (C)2014-2019"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "Delivery Order Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "2.2019.1125.1"
-                VALUE "FileVersion", "2.2019.1125.1"
+                VALUE "ProductVersion", "2.2019.1224.1"
+                VALUE "FileVersion", "2.2019.1224.1"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -24,7 +24,7 @@
 //#define APP_VERSION               "2.2019.729.1"
 //#define APP_VERSION               "2.2019.815.1"
 //#define APP_VERSION               "2.2019.916.2"
-#define APP_VERSION               "2.2019.1125.1"
+#define APP_VERSION               "2.2019.1224.1"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号