测试token未切换1.添加标签打印功能;2.修改皮肤;3屏蔽退单按钮

takeout/base/Print/printlib.cpp

@@ -24,6 +24,11 @@ PrintLib::PrintLib()
         f_PrintBarCode = (PrintBarCode)m_print_lib.resolve("PrintBarCode");
         f_PrintQRCode = (PrintQRCode)m_print_lib.resolve("PrintQRCode");
         f_FreeLine = (FreeLine)m_print_lib.resolve("FreeLine");
+
+        f_TSCInit = (TSCInit)m_print_lib.resolve("TSCInit");
+        f_TSCWinPrintln = (TSCWinPrintln)m_print_lib.resolve("TSCWinPrintln");
+        f_TSCWinPrintPage = (TSCWinPrintPage)m_print_lib.resolve("TSCWinPrintPage");
+
     }
     qDebug()<<"dll load";
     if(f_OpenPrinter&&f_ClosePrinter&&f_LaodAddress)
@@ -33,6 +38,49 @@ PrintLib::PrintLib()
     }
 }
 
+void PrintLib::_PrintLab( OrderObject* order)
+{
+    QString deliveryTime;
+    QString datetime;
+    if(order->delivery_time==0)
+    {
+        deliveryTime = QDateTime::currentDateTime().toString("hh:mm");
+        datetime = QDateTime::currentDateTime().toString("MM/dd");
+    }else{
+        deliveryTime = QDateTime::fromTime_t(order->delivery_time).toString("hh:mm");
+        datetime = QDateTime::currentDateTime().toString("MM/dd");
+    }
+    int index;
+    foreach(ProductObject* dish,order->proList)
+    {
+        f_TSCInit();
+        QString title = QString("%1   %2 %3 %4/%5").arg(QString::number(order->order_index), datetime, deliveryTime, QString::number(++index),QString::number(order->proList.size()));
+        f_TSCWinPrintln(10,0,25,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),title.toLocal8Bit().data(),0);
+        f_TSCWinPrintln(0,0,22,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),"--------------------------------",0);
+        f_TSCWinPrintln(10,0,30,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),dish->name.
+                        append(" ¥").
+                        append(QString::number(dish->price/100.0, 'f', 2)).toLocal8Bit().data(),0.0666665);
+        QString property_tags;
+        if(!dish->property_tags.isEmpty())
+        {
+            property_tags.append(dish->property_tags);
+            property_tags.append(",");
+        }
+        if(!dish->sub_products.isEmpty())
+        {
+            foreach(ProductObject* sub_dish,dish->sub_products)
+            {
+                property_tags.append(sub_dish->name);
+                property_tags.append(",");
+            }
+        }
+        property_tags.remove(property_tags.length()-1,1);
+        f_TSCWinPrintln(10,0,24,0,2,2,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),property_tags.toLocal8Bit().data(),0.0666665);
+        f_TSCWinPrintln(10,180,26,0,2,0,0,QString("\xE5\xAE\x8B\xE4\xBD\x93").toLocal8Bit().data(),QString("\xE7\x9C\x9F\xE5\x8C\x97\xE4\xB9\x90\xE8\xB4\xAD ").toLocal8Bit().data(),0.0666665);
+        f_TSCWinPrintPage("1","1");
+    }
+}
+
 bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error)
 {
     QByteArray iniData = _GetPrintIni().toLocal8Bit();
@@ -59,6 +107,7 @@ bool PrintLib::DoPrint(const QByteArray &content, OrderObject *orderObject, QStr
             return false;
         }
         _PrintLineNode(doc,_order);
+        _PrintLab(_order);
         f_ClosePrinter();
         return true;
     }
@@ -97,6 +146,7 @@ bool PrintLib::DoPrint(const QString &content, OrderObject *orderObject, QString
             return false;
         }
         _PrintLineNode(doc,_order);
+        _PrintLab(_order);
         f_ClosePrinter();
         return true;
     }
@@ -319,5 +369,16 @@ QString PrintLib::_GetPrintIni()
     ini.append("|");
     ini.append( config.value("Printer/LogDays").toString());
     ini.append("|");
+
+    //打印标签
+    ini.append(config.value("Printer/wigth","40").toString());
+    ini.append("|");
+    ini.append(config.value("Printer/high","30").toString());
+    ini.append("|");
+    ini.append( config.value("Printer/speed","3").toString());
+    ini.append("|");
+    ini.append( config.value("Printer/crow","1").toString());
+    ini.append("|");
+
     return ini;
 }

takeout/base/Print/printlib.h

@@ -21,6 +21,8 @@ public:
 
     bool DoPrint(const QByteArray &content, OrderObject *orderObject, QString &error);
     bool DoPrint(const QString &content, OrderObject *orderObject, QString &error);
+
+    void _PrintLab( OrderObject* order);
     //bool OpenPrinter();
     //void ClosePrinter();
 //    bool PrintQRCode(char data[], int type,  int leftMargin,int width);
@@ -28,7 +30,6 @@ public:
 //    bool PrintText(char data[], int fontType,int fontStyle ,int width,int height);
 //    bool FreeLine();
 
-
 private:
 
     typedef bool ( *OpenPrinter)( void);
@@ -37,6 +38,11 @@ private:
     typedef void ( *ClosePrinter)(void);
     typedef bool ( *LoadAddress)(void);
     typedef int  (*Total)(int);
+
+    typedef int (*TSCInit)();
+    typedef int (*TSCWinPrintln)(int x, int y, int font_size, int rotate, int font_type, int high_len, int line, char *font_name, char *data, double font_ratio);
+    typedef int (*TSCWinPrintPage)(char *page, char *num);
+
     //打印行
     typedef bool (*PrintLine)(char data[], int ,int  ,int ,int );
     //打印条码
@@ -46,6 +52,8 @@ private:
     //空行
     typedef bool (*FreeLine)();
 
+
+
     int total;
     QLibrary m_print_lib;
     bool m_b_load_sucfl;
@@ -61,6 +69,10 @@ private:
     PrintQRCode f_PrintQRCode;
     QStringList _list;
 
+    TSCInit f_TSCInit;
+    TSCWinPrintln f_TSCWinPrintln;
+    TSCWinPrintPage f_TSCWinPrintPage;
+
     OrderObject *_order;
     QString _GetPrintIni();
     void _PrintLine(const LineNode& line,  ProductObject* dish=0);

takeout/preDefine.h

@@ -14,12 +14,12 @@
 #define DEFAULT_DBNAME              "order.db"
 #define DEFAULT_DBFORM              "orderlist"
 
-//#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-//#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
+#define SHA256RSA_PRIVATEKEY        "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+#define DEFAULT_ACCESS_TOKEN        "1a3bd3e3-02b4-44ac-ab13-65069e85938b"
 
 //正式环境
-#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
-#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
+//#define SHA256RSA_PRIVATEKEY         "MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKbFeAqipCea1OXTR6wmz2D7XKUJ6ffRl/VRgF23kbxhhUseJ1jWJW9n7bJ1DyJsMzNgLzpi5jwCasZlvMAS+TdRYQtlvdHV8EDH8JKVaCn1O+emoN/Tbp+ngZLkZNqu3bWTQ6fBgbun4gyeFC1cXb87kn0dnBdkjnGZ/MuDu9oPAgMBAAECgYEAip3t1iEzgnvOY60GkM+9ZWXoroEcCNEcllqE8OCo8MS6LyLEH7H3ca8XwlJMHxeCQzy6ZLRZnB2CNJ/RkHD01S12JH3NPoeuY04/zhpl1BRq5Zm9iuIMkg5LP1cNjRnB5v8/ENZdLTXYEcrz4d3UDXZXvD2ywqoNNGqMqqp/U1ECQQDma32C2t3LV3lS9QeLejGXwDTeksJ53NzsUoGUOIQNkIC7f66tQfYG6wVWBfGoZTpxcLWweC+jPQ+75knWdmLHAkEAuUkYGKtzIeNmKJ0siew/dY31+Rb/pVHYj7TnZDx3dIYly0mwigQGCU7uVzkADXqyEqU+AQWU+RagQWwmjlWGeQJBALdYiMJ6zUlkDVIJTzuYu6V4d5kzRjQZnmEdNaZvYgQ5G3YWnzOV7OKMV+6fRC8ufVaOzMPinmVRzRdCozZXdTkCQQCapPo6pOasMyqx3TUuTINOr1TMOLjYl65Diz7Rt3IQTGLBAFkbaG5NWJavMADuPyjfTRGqMql7GLpawFSR2aopAkEAmKme0TgKB4EpdxS7xV4/XEm+MuZXE/dAfnN5fNOVueWw+23gDYvLXZAoAZNdpdaWw/CZl66XL6M1RMiDYllNvw=="
+//#define DEFAULT_ACCESS_TOKEN         "5c1bf782-a117-4aed-8ddc-66a415820d34"
 
 #define TIMEOUT_TRY_LOGING          20000
 #define TIMEOUT_TRY_PULLORDER       60000

takeout/takeout.rc

@@ -4,8 +4,8 @@
 #include <winver.h>
 #endif
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 1,0,0,8
-    PRODUCTVERSION 1,0,0,8
+    FILEVERSION 2,0,0,0
+    PRODUCTVERSION 2,0,0,0
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
     FILEFLAGS VS_FF_DEBUG
@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
             BEGIN
                 VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
                 VALUE "FileDescription", "FREEMUD Manager System"
-                VALUE "FileVersion", "1.0.0.8"
+                VALUE "FileVersion", "2.0.0.0"
                 VALUE "InternalName", "FREEMUD"
                 VALUE "LegalCopyright", "Copyright (C)2017-2020"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "fmTakeout"
-                VALUE "ProductVersion", "1.0.0.8"
+                VALUE "ProductVersion", "2.0.0.0"
             END
         END
         BLOCK "VarFileInfo"

takeout/view/detailForm.cpp

@@ -63,6 +63,8 @@ void DetailForm::InitData(OrderObject *orderObject)
 
     ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));
     ui->detailLab8->setText(orderObject->has_invoiced? QString::fromLocal8Bit("发票抬头:%1").arg(orderObject->invoice_title) : QString::fromLocal8Bit("不需要发票"));
+    ui->detailLab8_3->setText(QString::fromLocal8Bit("%1").arg(QString::number(orderObject->package_fee / 100.0, 'f', 2).append(QString::fromLocal8Bit("(元)"))));
+
 
     for(int i=0; i<orderObject->proList.count(); i++)
     {
@@ -111,7 +113,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailBtn2->setText(GetOperNameByStatus(orderObject->status, true));
     ui->detailBtn2->setProperty("operation", GetOperByStatus(orderObject->status, true));
     ui->detailBtn2->setProperty("orderId", orderObject->order_id);
-    if(orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&& orderObject->status != 4)
+    if(/*orderObject->status != 1 && orderObject->status != 20&& orderObject->status != 2&&*/ orderObject->status != 4)
     {
         ui->detailBtn2->hide();
     }
@@ -127,7 +129,6 @@ void DetailForm::InitData(OrderObject *orderObject)
     {
         ui->detailBtn3->hide();
     }
-
 }
 
 void DetailForm::_Init()

takeout/view/detailForm.ui

@@ -114,13 +114,10 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="0,0">
+    <layout class="QHBoxLayout" name="horizontalLayout_10">
      <property name="spacing">
       <number>0</number>
      </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,4,1">
        <property name="spacing">
@@ -291,9 +288,6 @@
        <property name="spacing">
         <number>0</number>
        </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QLabel" name="detailRightHead">
          <property name="minimumSize">
@@ -779,6 +773,63 @@
         </layout>
        </item>
        <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,1">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="detailSlab8_3">
+           <property name="minimumSize">
+            <size>
+             <width>73</width>
+             <height>35</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>73</width>
+             <height>70</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>打包费:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="detailLab8_3">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>35</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>70</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+           <property name="margin">
+            <number>8</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
         <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0,1">
          <property name="spacing">
           <number>0</number>

takeout/view/mainForm.cpp

@@ -255,6 +255,8 @@ void MainForm::_Init()
     // 显示托盘
     m_tray.show();
 
+    ui->mainBtnDayReport->hide();
+
     // 设置任务栏图标和标题
     setWindowIcon(QIcon(":fm.ico"));