提交

fmPlugin/fmPlugin.pro

@@ -22,6 +22,8 @@ HEADERS +=\
         fmplugin_global.h \
     fmPlugin.h
 
+DESTDIR = ../MiYou
+
 unix {
     target.path = /usr/lib
     INSTALLS += target

fmPrinter/fmPrinter.pro

@@ -27,3 +27,5 @@ unix {
 }
 
 LIBS += -lWinspool
+
+DESTDIR = ../MiYou

fmTakeaway/detailForm.cpp

@@ -58,32 +58,34 @@ void DetailForm::InitData(OrderObject *orderObject)
 
     QString topName = "";
     QTreeWidgetItem* topItem = NULL;
-    for(int i=0; i<orderObject->proList.count(); i++)
+    QMultiMap<QString, ProductObject* > map;
+
+    QListIterator<ProductObject*> listIte(orderObject->proList);
+    while(listIte.hasNext())
     {
-        if(orderObject->proList.at(i)->bsk_num.isEmpty())
+        ProductObject * pObj = listIte.next();
+        map.insert(pObj->bsk_num, pObj);
+    }
+
+    foreach(QString key, map.uniqueKeys())
+    {
+        topName = QString("%1号口袋").arg(key);
+        topItem = new QTreeWidgetItem(QStringList()<<topName);
+        ui->detailTable0->addTopLevelItem(topItem);
+
+        foreach(ProductObject * pObj, map.values(key))
         {
-            orderObject->proList.at(i)->bsk_num = "1";
+            QTreeWidgetItem *cItem = new QTreeWidgetItem(QStringList()<< pObj->name
+                                                        << Penny2Dollar(pObj->price)
+                                                        << QString::number(pObj->productAmount));
+            cItem->setTextAlignment(0, Qt::AlignCenter);
+            cItem->setTextAlignment(1, Qt::AlignCenter);
+            cItem->setTextAlignment(2, Qt::AlignCenter);
+            topItem->addChild(cItem);
         }
-        if(topName.compare(orderObject->proList.at(i)->bsk_num))
-        {
-            if(topItem!=NULL)
-            {
-                topItem->setExpanded(true);
-            }
-            topName = orderObject->proList.at(i)->bsk_num;
-            topItem = new QTreeWidgetItem(QStringList()<<QString("%1号口袋").arg(topName));
 
-            ui->detailTable0->addTopLevelItem(topItem);
-        }
-        QTreeWidgetItem *cItem = new QTreeWidgetItem(QStringList()<< orderObject->proList.at(i)->name
-                                                    << Penny2Dollar(orderObject->proList.at(i)->price)
-                                                    << QString::number(orderObject->proList.at(i)->productAmount));
-        cItem->setTextAlignment(0, Qt::AlignCenter);
-        cItem->setTextAlignment(1, Qt::AlignCenter);
-        cItem->setTextAlignment(2, Qt::AlignCenter);
-        topItem->addChild(cItem);
+        topItem->setExpanded(true);
     }
-    topItem->setExpanded(true);
 
     QString records;
     foreach(QString record, orderObject->records)

fmTakeaway/fmTakeaway.pro

@@ -78,10 +78,12 @@ RC_FILE += fmTakeaway.rc
 
 
 CONFIG(release, debug|release) {
-    LIBS += -L../fmPlugin/release -lfmPlugin
-    LIBS += -L../fmPrinter/release -lfmPrinter
+    LIBS += -L../MiYou -lfmPlugin
+    LIBS += -L../MiYou -lfmPrinter
 } else {
     LIBS += -L../fmPlugin/debug -lfmPlugin
     LIBS += -L../fmPrinter/debug -lfmPrinter
 }
 
+DESTDIR = ../MiYou
+