11

fmPrinter/fmPrinter.cpp

@@ -143,7 +143,7 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
                .arg(pData->customer).arg(pData->phone).arg(pData->address).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==0? "立即送出" : QDateTime::fromTime_t(pData->delivery_time).toString("MM/dd hh:mm"));
+               .arg(pData->delivery_time==0? "立即送出" : QDateTime::fromTime_t(pData->delivery_time).toString("MM/dd hh:mm")).arg(pData->has_invoiced?"是":"否").arg(pData->invoice_title);
 
        str_list.append(print);
     }