fix new Feature

    Support Main Product No Split Qty

fmTakeout/Model/dishesObject.h

@@ -19,6 +19,7 @@ class dishesObject : public QObject
     Q_PROPERTY (int packagePrice READ getpackagePrice WRITE setpackagePrice)
     Q_PROPERTY (int sequence READ getSequence WRITE setSequence)
     Q_PROPERTY (int qty READ getqty WRITE setqty)
+    Q_PROPERTY (int qtyNoSplit READ getQtyNoSplit WRITE setQtyNoSplit)
     Q_PROPERTY (int price READ getprice WRITE setprice)
     Q_PROPERTY (QString options READ getoptions WRITE setoptions)
 
@@ -49,6 +50,7 @@ public:
     QString defaultImage;
     QString code;
     int qty;
+    int qtyNoSplit;
     int packagePrice;
     int price;
     int sequence;
@@ -110,6 +112,8 @@ protected:
     inline int getqty(){ return qty; }
     inline void setqty(const int& v){ qty = v; }
 
+    inline int getQtyNoSplit(){ return qtyNoSplit; }
+    inline void setQtyNoSplit(const int& v){ qtyNoSplit = v; }
 
     inline QString getpromotionSku(){ return promotionSku; }
     inline void setpromotionSku(const QString& v){ promotionSku = v; }

fmTakeout/Model/orderObject.cpp

@@ -79,6 +79,7 @@ void OrderObject::FromJson(const QJsonObject &json)
         dishesObject *proObject = new dishesObject(this);
         //初始商品数据信息;
         proObject->qty = 0;
+        proObject->qtyNoSplit = 0;
         proObject->promotionQty = 0;
         proObject->promotionPrice = 0;
         proObject->starPromotionQty = 0;

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,9,28
-    PRODUCTVERSION 2,2020,9,28
+    FILEVERSION 2,2020,9,29
+    PRODUCTVERSION 2,2020,9,29
     //*************************************************************************//
     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.9.28"
-                VALUE "FileVersion", "2.2020.9.28"
+                VALUE "ProductVersion", "2.2020.9.29"
+                VALUE "FileVersion", "2.2020.9.29"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -29,7 +29,7 @@
 //#define APP_VERSION               "2.2020.5.26"
 //#define APP_VERSION               "2.2020.6.29"
 //#define APP_VERSION               "2.2020.8.10"
-#define APP_VERSION               "2.2020.9.28"
+#define APP_VERSION               "2.2020.9.29"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号