增加切纸指令

fmPrinter/fmPrinter.cpp

@@ -22,11 +22,11 @@ bool FmPrinter::DoPrint(QString printerName, OrderObject *pData)
            return false;
        }
 
-       QPrinter printer;
-       printer.setPrinterName(printerName);
-       printer.setPageSizeMM(QSizeF(0, 0));
-       QTextDocument text("");
-       text.print(&printer);
+//       QPrinter printer;
+//       printer.setPrinterName(printerName);
+//       printer.setPageSizeMM(QSizeF(0, 0));
+//       QTextDocument text("");
+//       text.print(&printer);
     }
 
     return true;
@@ -92,7 +92,7 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
                .arg(pData->customer).arg(pData->phone).arg(pData->address.replace("埇","Yong")).arg(str_comd_list)
                .arg(_Penny2Dollar(pData->total_fee-pData->send_fee)).arg(_Penny2Dollar(pData->discount_fee)).arg(_Penny2Dollar(pData->send_fee)).arg(pData->total_amount)
                .arg(fee).arg(QDateTime::fromTime_t(pData->create_time).toString("yy-MM-dd hh:mm")).arg(pData->remark).arg(pData->courier_name).arg(pData->courier_phone)
-               .arg(pData->delivery_time);
+               .arg(pData->delivery_time==0? "立即送出" : QDateTime::fromTime_t(pData->delivery_time).toString("MM/dd hh:mm"));
 
        str_list.append(print);
     }
@@ -103,7 +103,13 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
 bool FmPrinter::_RawDataToPrinter(QString printerName, QString data)
 {
     LPTSTR szPrinterName = (LPTSTR)printerName.toStdWString().c_str();
-    LPBYTE lpData=(LPBYTE)data.toLocal8Bit().data();
+
+    // 在行尾加上切纸命令
+    QByteArray tmpData = data.toLocal8Bit();
+    tmpData.append(27);
+    tmpData.append(105);
+
+    LPBYTE lpData=(LPBYTE)tmpData.data();
     DWORD dwCount = strlen((char*)lpData);
     BOOL     bStatus = FALSE;
     HANDLE     hPrinter = NULL;

fmTakeaway/Model/orderObject.cpp

@@ -360,12 +360,12 @@ void OrderObject::setstatus_desc(const QString &v)
     status_desc = v;
 }
 
-QString OrderObject::getdelivery_time() const
+int OrderObject::getdelivery_time() const
 {
     return delivery_time;
 }
 
-void OrderObject::setdelivery_time(const QString &v)
+void OrderObject::setdelivery_time(const int &v)
 {
     delivery_time = v;
 }

fmTakeaway/Model/orderObject.h

@@ -48,7 +48,7 @@ public:
     Q_PROPERTY (QString courier_name READ getcourier_name WRITE setcourier_name)
     Q_PROPERTY (QString courier_phone READ getcourier_phone WRITE setcourier_phone)
     Q_PROPERTY (QString status_desc READ getstatus_desc WRITE setstatus_desc)
-    Q_PROPERTY (QString delivery_time READ getdelivery_time WRITE setdelivery_time)
+    Q_PROPERTY (int delivery_time READ getdelivery_time WRITE setdelivery_time)
     Q_PROPERTY (int delivery_status READ getdelivery_status WRITE setdelivery_status)
     Q_PROPERTY (QString fm_id READ getfm_id WRITE setfm_id)
     Q_PROPERTY (QStringList records READ getrecords WRITE setrecords)
@@ -73,7 +73,7 @@ public:
     int channelNum;          //渠道当天序号
     int create_time;         //订单时间
     QString delivery_party;  //派送方式
-    QString delivery_time;   //期望送达时间
+    int delivery_time;   //期望送达时间
     int delivery_status;     //配送状态
     int discount_fee;        //商品优惠
     int expire_time;         //订单倒计时
@@ -174,8 +174,8 @@ protected:
     void setcourier_phone(const QString& v);
     QString getstatus_desc() const;
     void setstatus_desc(const QString& v);
-    QString getdelivery_time() const;
-    void setdelivery_time(const QString& v);
+    int getdelivery_time() const;
+    void setdelivery_time(const int& v);
     QString getfm_id() const;
     void setfm_id(const QString& v);
     int getdelivery_status() const ;

fmTakeaway/detailForm.cpp

@@ -42,7 +42,7 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab3->setText(orderObject->address);
     ui->detailLab4->setText(QString("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
                                                                  Penny2Dollar(orderObject->send_fee)));
-    ui->detailLab5->setText(orderObject->delivery_time);
+    ui->detailLab5->setText(orderObject->delivery_time==0? "立即送出" : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
     ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? "暂未指定" : QString("[姓名]%1 [电话]%2")
                                                                             .arg(orderObject->courier_name, orderObject->courier_phone));
     ui->detailLab7->setText(!orderObject->pay_type.compare("在线支付") ? "0" : Penny2Dollar(orderObject->shop_fee));