Fix 1:修复小票不打印篮子信息

fmPrinter/fmPrinter.cpp

@@ -20,6 +20,7 @@ bool FmPrinter::DoPrint(QString printerName, OrderObject *pData, QString& error)
     {
        if(printerName.compare("禁用此打印机"))
        {
+           qDebug() << data;
            if(!_RawDataToPrinter(printerName, data, error))
            {
                return false;
@@ -48,15 +49,40 @@ QStringList FmPrinter::_GetPrintData(OrderObject *pData)
     if( !file.open( QFile::ReadOnly)){
         return QStringList();
     }
-    for(int i=0; i<pData->proList.count(); i++)
+
+    QMultiMap<QString, ProductObject* > map;
+
+    QListIterator<ProductObject*> listIte(pData->proList);
+    while(listIte.hasNext())
+    {
+        ProductObject * pObj = listIte.next();
+        map.insert(pObj->bsk_num, pObj);
+    }
+
+    foreach(QString key, map.uniqueKeys())
     {
-        QString name, price;
-        name = pData->proList[i]->name;
-        price = QString("\r\n              x%1          %2         %3\r\n").arg(pData->proList[i]->productAmount).arg(_Penny2Dollar(pData->proList[i]->price))
-                .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
-        str_comd_list.append(QString(name+price));
+        QString topName = QString("【%1号口袋】\r\n").arg(key);
+        str_comd_list.append(topName);
+        foreach(ProductObject* pObj, map.values(key))
+        {
+            QString name, price;
+            name = pObj->name;
+            price = QString("\r\n              x%1          %2         %3\r\n").arg(pObj->productAmount).arg(_Penny2Dollar(pObj->price))
+                    .arg(_Penny2Dollar(pObj->price*pObj->productAmount));
+            str_comd_list.append(QString(name+price));
+        }
     }
 
+
+//    for(int i=0; i<pData->proList.count(); i++)
+//    {
+//        QString name, price;
+//        name = pData->proList[i]->name;
+//        price = QString("\r\n              x%1          %2         %3\r\n").arg(pData->proList[i]->productAmount).arg(_Penny2Dollar(pData->proList[i]->price))
+//                .arg(_Penny2Dollar(pData->proList[i]->price*pData->proList[i]->productAmount));
+//        str_comd_list.append(QString(name+price));
+//    }
+
     QByteArray array = file.readAll();
     str_print = QString::fromUtf8(array);