添加缓存菜单字段

fmTakeaway/MainForm.cpp

@@ -357,7 +357,7 @@ void MainForm::onFloatMoved(QPoint pos)
 
 void MainForm::_InitUI()
 {
-    this->setWindowFlags(windowFlags() /*| Qt::WindowStaysOnTopHint |Qt::FramelessWindowHint*/);
+    this->setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint |Qt::FramelessWindowHint);
     //this->showFullScreen();
     m_size = this->size();
 

fmTakeaway/Util/wbillcontrol.cpp

@@ -273,6 +273,13 @@ void WBillControl::setMenu(const QByteArray &JsonMenu)
        menu.strMenuId = orderObj["strMenuId"].toString();
        menu.iPrinterId = orderObj["iPrinterId"].toInt();
        menu.strDevice = orderObj["strDevice"].toString();
+
+       menu.iBaud = orderObj["iBaud"].toInt();
+       menu.strTitle = orderObj["strTitle"].toString();
+       menu.iOrderPrinterId = orderObj["iOrderPrinterId"].toInt();
+       menu.strOrderDevice = orderObj["strOrderDevice"].toString();
+       menu.iOrderBaud = orderObj["iOrderBaud"].toInt();
+       menu.strOrderTitle = orderObj["strOrderTitle"].toString();
        vecMenu.push_back(menu);
     }
 }

fmTakeaway/Util/wbillcontrol.h

@@ -15,9 +15,15 @@ typedef struct {
 
 struct PrinterMenu
 {
-    QString strMenuId;
-    int     iPrinterId;
-    QString strDevice;
+    QString strMenuId;           //菜品ID
+    int     iPrinterId;          //打印机ID(厨房)
+    QString strDevice;           //打印机端口(厨房)
+    int     iBaud;               //波特率(厨房)
+    QString strTitle;            //打印标题(厨房)
+    int     iOrderPrinterId;     //打印机ID(上菜单)
+    QString strOrderDevice;      //打印机端口(上菜单)
+    int     iOrderBaud;          //波特率(上菜单)
+    QString strOrderTitle;       //打印标题(上菜单)
 };
 
 class WBillControl : public QObject

fmTakeaway/fmTakeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2017-09-25T09:09:44. -->
+<!-- Written by QtCreator 3.5.1, 2017-09-29T09:15:50. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>