1、中科英泰dll路径可配置

2、口碑自提单接单打印

fmPrinter/fmPrinter.cpp

@@ -76,6 +76,7 @@ FmPrinter::FmPrinter()
     QSettings *fmps=new QSettings(iniFmpsPath,QSettings::IniFormat);
     fmps->setIniCodec("GB2312");
     QString printerName = fmps->value("DRIVER/driver").toString();
+    QString dllpath = fmps->value("DRIVER/path").toString();
 
     if(!printerName.compare(QString("中科英泰")))
         printer = ZHONGKEYINGTAI;
@@ -87,7 +88,7 @@ FmPrinter::FmPrinter()
     switch(printer)
     {
     case ZHONGKEYINGTAI:
-        m_print_lib.setFileName("pos_ad_dll.dll");
+        m_print_lib.setFileName(dllpath);
         if(m_print_lib.load())
         {
             m_pOpenPrinter = (fmOpenPrinter)m_print_lib.resolve("OpenPrinter");
@@ -491,7 +492,7 @@ bool FmPrinter::_PrintBodyForShangmiPrinter(OrderObject *pData)
 bool FmPrinter::_RawDataToPrinter(QString printerName, QString data)
 {
     QByteArray tmpData = data.toLocal8Bit();
-    char temchar[2048]={0x0};
+    char temchar[4096]={0x0};
     if(m_b_load_sucfl)
     {
         strcpy(temchar,tmpData.data());
@@ -557,7 +558,9 @@ bool FmPrinter::_shangmiPrinter(QString data)
 bool FmPrinter::_fmPrintData(QString data)
 {
     if(m_b_load_sucfl){
+        qDebug()<<"dll load succeed";
         if(HS_OK==m_pOpenPrinter()){
+            qDebug()<<"open printer succeed";
             m_pPrintText(data.toLocal8Bit().data(),35);
 //            char tmpCode[40];
 //            m_pPrintHex("\x0A",1);
@@ -570,7 +573,11 @@ bool FmPrinter::_fmPrintData(QString data)
             m_pCutPaper(0);
             m_pClosePrinter();
             return true;
+        }else {
+            qDebug()<<"open printer failed";
         }
+    } else {
+        qDebug()<<"dll load failed";
     }
     return false;
 }

fmTakeaway/Control/flowControl.cpp

@@ -197,7 +197,7 @@ bool FlowControl::_PullOrder()
                     {
                         Orderstatus::getInstance().statusinsert(orderId,0);
                     }
-                    if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId)&&orderObject->order_type!=3)
+                    if(orderObject->status==2&&!Orderstatus::getInstance().isprint(orderId)&&(orderObject->order_type!=3||!orderObject->channel.compare("koubeiwaimai")))
                     {
                         emit startRemind(0);
                         QLOG_INFO()<<QString("[---begin to tip---]");
@@ -584,7 +584,7 @@ bool FlowControl::_ChargeOffOrder(const QString &orderId)
         {
             emit showAlert(AlertForm::SUCCESS, "核销成功!");
 
-            if(m_ordersMap.value(orderId)->order_type == 3)
+            if(m_ordersMap.value(orderId)->order_type == 3 && m_ordersMap.value(orderId)->channel.compare("koubeiwaimai"))
             {
                 // 打印
                 QLOG_INFO() << QString("[---begin print---]");