这个是定型的版本

handle/printer/boxtemlateone.cpp

@@ -1,292 +1,337 @@
 #include "boxtemlateone.h"
 #include "pqQtlib/log/pqlog.h"
-BoxTemlateOne::BoxTemlateOne()
-{
-
-}
+BoxTemlateOne::BoxTemlateOne() {}
 //默认箱单
 QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box)
 {
     QSharedPointer<PackInfo> pinfo = box->parentPack();
-    if(pinfo.isNull()) return QImage();
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    if (pinfo.isNull())
+        return QImage();
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(5*5,5*5,90*5,15*5);
-    painter.drawRect(5*5,20*5,90*5,35*5);
-    painter.drawLine(20*5,20*5,20*5,55*5);
-    painter.drawLine(50*5,20*5,50*5,55*5);
-    painter.drawLine(66*5,20*5,66*5,55*5);
-    painter.drawLine(5*5,27*5,95*5,27*5);
-    painter.drawLine(5*5,34*5,95*5,34*5);
-    painter.drawLine(5*5,41*5,95*5,41*5);
-    painter.drawLine(5*5,48*5,95*5,48*5);
-    painter.drawRect(5*5,55*5,90*5,15*5);
-    painter.drawRect(5*5,70*5,90*5,7*5);
-
-    QRect target(0*5, 57*5, 100*5, 65*5);
-//    QRect source(-10*5, 0, 65*5, 40*5);
-    QString bar = box->caseNumber();
-    code.draw(painter,target,bar);
-//    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
-
-    painter.setRenderHint(QPainter::Antialiasing,true);
-    painter.setRenderHint(QPainter::TextAntialiasing,true);
-    painter.setRenderHint(QPainter::HighQualityAntialiasing,true);
+    painter.drawRect(5 * 5, 5 * 5, 90 * 5, 15 * 5);
+    painter.drawRect(5 * 5, 20 * 5, 90 * 5, 35 * 5);
+
+    painter.drawLine(20 * 5, 20 * 5, 20 * 5, 41 * 5);
+    painter.drawLine(50 * 5, 20 * 5, 50 * 5, 41 * 5);
+    painter.drawLine(66 * 5, 20 * 5, 66 * 5, 41 * 5);
+
+    painter.drawLine(5 * 5, 27 * 5, 95 * 5, 27 * 5);
+    painter.drawLine(5 * 5, 34 * 5, 95 * 5, 34 * 5);
+    painter.drawLine(5 * 5, 41 * 5, 95 * 5, 41 * 5);
+    //    painter.drawLine(5 * 5, 48 * 5, 95 * 5, 48 * 5);
+    //    painter.drawRect(5 * 5, 55 * 5, 90 * 5, 7 * 5);
+    painter.drawRect(5 * 5, 41 * 5, 90 * 5, 7 * 5);
+
+    //    QRect target(0 * 5, 57 * 5, 100 * 5, 65 * 5);
+    //    //    QRect source(-10*5, 0, 65*5, 40*5);
+    //    QString bar = box->caseNumber();
+    //    code.draw(painter, target, bar);
+
+    //    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
+
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setRenderHint(QPainter::TextAntialiasing, true);
+    painter.setRenderHint(QPainter::HighQualityAntialiasing, true);
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(40);
     font.setWeight(QFont::ExtraLight);
     font.setBold(true);
     painter.setFont(font);
-    painter.drawText(5*5,5*5,90*5,15*5, Qt::AlignCenter, box->parentPack()->customer);
+    painter.drawText(5 * 5, 5 * 5, 90 * 5, 15 * 5, Qt::AlignCenter, box->parentPack()->customer);
 
     font.setPixelSize(20);
     font.setBold(true);
     painter.setFont(font);
-    painter.drawText(8*5,25*5,QStringLiteral("品名"));
-    painter.drawText(53*5,25*5,QStringLiteral("毛重"));
-    painter.drawText(8*5,32*5,QStringLiteral("批号"));
-    painter.drawText(53*5,32*5,QStringLiteral("净重"));
-    painter.drawText(8*5,39*5,QStringLiteral("规格"));
-    painter.drawText(53*5,39*5,QStringLiteral("筒数"));
-    painter.drawText(8*5,46*5,QStringLiteral("等级"));
-    painter.drawText(53*5,46*5,QStringLiteral("捻向"));
-    painter.drawText(8*5,53*5,QStringLiteral("箱号"));
-    painter.drawText(50*5,53*5,QStringLiteral("纸管颜色"));
-
-    painter.drawText(21*5,25*5,pinfo->info()->product_type_code);
-    painter.drawText(21*5,32*5,pinfo->info()->batch_no);
-    painter.drawText(21*5,39*5,pinfo->info()->specs);
-    painter.drawText(67*5,25*5,QString("%1 kg").arg(getDecimalbit(box->gross_weight / 1000.00)));//datalist.at(0));
-
-    painter.drawText(67*5,32*5,QString("%1 kg").arg(getDecimalbit(box->net_weight / 1000.00)));//datalist.at(1));
-
-    painter.drawText(67*5,39*5,QString::number(box->tube_number));//datalist.at(2));
-    painter.drawText(21*5,46*5,box->Level);//datalist.at(3));
-    painter.drawText(67*5,46*5,box->twist_type);//datalist.at(4));
-    painter.drawText(67*5,53*5,box->bucket_color);//datalist.at(6));
-
-    font.setPixelSize(16);
-    painter.setFont(font);
-    painter.drawText(21*5,53*5,box->caseNumber());//datalist.at(5));
-
+    painter.drawText(8 * 5, 25 * 5, QStringLiteral("机号"));
+    painter.drawText(53 * 5, 25 * 5, QStringLiteral("规格"));
+    painter.drawText(8 * 5, 32 * 5, QStringLiteral("批号"));
+    painter.drawText(53 * 5, 32 * 5, QStringLiteral("净重"));
+    painter.drawText(8 * 5, 39 * 5, QStringLiteral("筒数"));
+    painter.drawText(53 * 5, 39 * 5, QStringLiteral("捻向"));
+
+    //    painter.drawText(8 * 5, 46 * 5, QStringLiteral("等级"));
+    //    painter.drawText(53 * 5, 46 * 5, QStringLiteral("捻向"));
+    //    painter.drawText(8 * 5, 53 * 5, QStringLiteral("箱号"));
+    //    painter.drawText(50 * 5, 53 * 5, QStringLiteral("纸管颜色"));
+
+    painter.drawText(21 * 5, 25 * 5, pinfo->info()->machine_no);
+    painter.drawText(21 * 5, 32 * 5, pinfo->info()->batch_no);
+    painter.drawText(21 * 5, 39 * 5, QString::number(box->tube_number));
+
+    painter.drawText(67 * 5, 25 * 5, pinfo->info()->specs);
+
+    painter.drawText(67 * 5,
+                     32 * 5,
+                     QString("%1 kg").arg(
+                         getDecimalbit(box->net_weight / 1000.00))); // datalist.at(1));
+
+    painter.drawText(67 * 5, 39 * 5, box->twist_type); // datalist.at(2));
+    //    painter.drawText(21 * 5, 46 * 5, box->Level);                        // datalist.at(3));
+    //    painter.drawText(67 * 5, 46 * 5, box->twist_type);                   // datalist.at(4));
+    //    painter.drawText(67 * 5, 53 * 5, box->bucket_color);                 // datalist.at(6));
+
+    //    font.setPixelSize(16);
+    //    painter.setFont(font);
+    //    painter.drawText(21 * 5, 53 * 5, box->caseNumber()); // datalist.at(5));
 
     font.setPixelSize(20);
     painter.setFont(font);
-    painter.drawText(5*5,70*5,90*5,7*5, Qt::AlignCenter, "服务电话:"+ box->parentPack()->telephone);
-    //painter.drawText(4*5,75*5," 电话:"+ box->parentPack()->telephone);
-
-//    print(image);
-
-    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-        image.save(path+"/xiangdan/code"+bar+".bmp");
+    painter.drawText(5 * 5,
+                     42 * 5,
+                     90 * 5,
+                     7 * 5,
+                     Qt::AlignLeft | Qt::AlignVCenter,
+                     "地址:" + box->parentPack()->address);
+
+    painter.drawText(5 * 5,
+                     49 * 5,
+                     90 * 5,
+                     7 * 5,
+                     Qt::AlignCenter,
+                     "联系电话:" + box->parentPack()->telephone);
+    // painter.drawText(4*5,75*5," 电话:"+ box->parentPack()->telephone);
+
+    //    print(image);
+
+    //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
+    //    image.save(path + "/xiangdan/code" + bar + ".bmp");
     return image;
 
-//    return img;
+    //    return img;
 }
 
 //默认箱单2
 QImage BoxTemlateOne::doPrinter1(QSharedPointer<BoxInfo> box)
 {
     QSharedPointer<PackInfo> pinfo = box->parentPack();
-    if(pinfo.isNull()) return QImage();
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    if (pinfo.isNull())
+        return QImage();
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(5*5,5*5,90*5,60*5);
-    painter.drawLine(5*5,14*5,95*5,14*5);
-    painter.drawLine(5*5,23*5,95*5,23*5);
-    painter.drawLine(5*5,32*5,95*5,32*5);
-    painter.drawLine(5*5,41*5,95*5,41*5);
-    painter.drawLine(5*5,50*5,95*5,50*5);
-    painter.drawLine(50*5,32*5,50*5,60*5);
-    painter.drawLine(20*5,5*5,20*5,60*5);
-    painter.drawLine(65*5,32*5,65*5,60*5);
-    painter.drawRect(5*5,60*5,90*5,15*5);
-//    painter.drawRect(5*5,70*5,90*5,7*5);
-
-    QRect target(0*5, 62*5, 100*5, 70*5);
-//    QRect source(-10*5, 0, 65*5, 40*5);
+    painter.drawRect(5 * 5, 5 * 5, 90 * 5, 60 * 5);
+    painter.drawLine(5 * 5, 14 * 5, 95 * 5, 14 * 5);
+    painter.drawLine(5 * 5, 23 * 5, 95 * 5, 23 * 5);
+    painter.drawLine(5 * 5, 32 * 5, 95 * 5, 32 * 5);
+    painter.drawLine(5 * 5, 41 * 5, 95 * 5, 41 * 5);
+    painter.drawLine(5 * 5, 50 * 5, 95 * 5, 50 * 5);
+    painter.drawLine(50 * 5, 32 * 5, 50 * 5, 60 * 5);
+    painter.drawLine(20 * 5, 5 * 5, 20 * 5, 60 * 5);
+    painter.drawLine(65 * 5, 32 * 5, 65 * 5, 60 * 5);
+    painter.drawRect(5 * 5, 60 * 5, 90 * 5, 15 * 5);
+    //    painter.drawRect(5*5,70*5,90*5,7*5);
+
+    QRect target(0 * 5, 62 * 5, 100 * 5, 70 * 5);
+    //    QRect source(-10*5, 0, 65*5, 40*5);
     QString bar = box->caseNumber();
-    code.draw(painter,target,bar);
-//    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
+    code.draw(painter, target, bar);
+    //    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
 
-//    painter.setRenderHint(QPainter::Antialiasing,true);
-//    painter.setRenderHint(QPainter::TextAntialiasing,true);
-//    painter.setRenderHint(QPainter::HighQualityAntialiasing,true);
+    //    painter.setRenderHint(QPainter::Antialiasing,true);
+    //    painter.setRenderHint(QPainter::TextAntialiasing,true);
+    //    painter.setRenderHint(QPainter::HighQualityAntialiasing,true);
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(18);
     font.setBold(true);
     painter.setFont(font);
-    painter.drawText(6*5,11*5,QStringLiteral("品   种"));
-    painter.drawText(6*5,20*5,QStringLiteral("规   格"));
-    painter.drawText(6*5,29*5,QStringLiteral("批   号"));
-    painter.drawText(6*5,38*5,QStringLiteral("等   级"));
-    painter.drawText(6*5,47*5,QStringLiteral("净   重"));
-    painter.drawText(6*5,56*5,QStringLiteral("筒   数"));
-    painter.drawText(50*5,38*5,QStringLiteral("纸管颜色"));
-    painter.drawText(51*5,47*5,QStringLiteral("毛   重"));
-    painter.drawText(51*5,56*5,QStringLiteral("箱   号"));
-//    painter.drawRect(text1);
+    painter.drawText(6 * 5, 11 * 5, QStringLiteral("品   种"));
+    painter.drawText(6 * 5, 20 * 5, QStringLiteral("规   格"));
+    painter.drawText(6 * 5, 29 * 5, QStringLiteral("批   号"));
+    painter.drawText(6 * 5, 38 * 5, QStringLiteral("等   级"));
+    painter.drawText(6 * 5, 47 * 5, QStringLiteral("净   重"));
+    painter.drawText(6 * 5, 56 * 5, QStringLiteral("筒   数"));
+    painter.drawText(50 * 5, 38 * 5, QStringLiteral("纸管颜色"));
+    painter.drawText(51 * 5, 47 * 5, QStringLiteral("毛   重"));
+    painter.drawText(51 * 5, 56 * 5, QStringLiteral("箱   号"));
+    //    painter.drawRect(text1);
 
     font.setPixelSize(20);
     painter.setFont(font);
-    painter.drawText(QRect(20*5,5*5,75*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,pinfo->info()->product_type_code);
-    painter.drawText(QRect(20*5,14*5,75*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,pinfo->info()->specs);
-    painter.drawText(QRect(20*5,23*5,75*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,pinfo->info()->batch_no);
-    painter.drawText(QRect(20*5,32*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,box->Level);
-    painter.drawText(QRect(20*5,41*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,QString("%1 kg").arg(getDecimalbit(box->net_weight / 1000.00)));
-    painter.drawText(QRect(20*5,50*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,QString::number(box->tube_number));
-    painter.drawText(QRect(65*5,32*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,pinfo->info()->bucket_color);
-    painter.drawText(QRect(65*5,41*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,QString("%1 kg").arg(getDecimalbit(box->gross_weight / 1000.00)));
+    painter.drawText(QRect(20 * 5, 5 * 5, 75 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     pinfo->info()->product_type_code);
+    painter.drawText(QRect(20 * 5, 14 * 5, 75 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     pinfo->info()->specs);
+    painter.drawText(QRect(20 * 5, 23 * 5, 75 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     pinfo->info()->batch_no);
+    painter.drawText(QRect(20 * 5, 32 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     box->Level);
+    painter.drawText(QRect(20 * 5, 41 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     QString("%1 kg").arg(getDecimalbit(box->net_weight / 1000.00)));
+    painter.drawText(QRect(20 * 5, 50 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     QString::number(box->tube_number));
+    painter.drawText(QRect(65 * 5, 32 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     pinfo->info()->bucket_color);
+    painter.drawText(QRect(65 * 5, 41 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     QString("%1 kg").arg(getDecimalbit(box->gross_weight / 1000.00)));
     font.setPixelSize(18);
     painter.setFont(font);
-    painter.drawText(QRect(65*5,50*5,30*5,9*5),Qt::AlignCenter|Qt::AlignHCenter,box->caseNumber());
+    painter.drawText(QRect(65 * 5, 50 * 5, 30 * 5, 9 * 5),
+                     Qt::AlignCenter | Qt::AlignHCenter,
+                     box->caseNumber());
 
-//    print(image);
+    //    print(image);
 
     QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-        image.save(path+"/xiangdan/code"+bar+".bmp");
+    image.save(path + "/xiangdan/code" + bar + ".bmp");
     return image;
 
-//    return img;
+    //    return img;
 }
 
-QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box,int ModelIndex)
+QImage BoxTemlateOne::doPrinter(QSharedPointer<BoxInfo> box, int ModelIndex)
 {
     boxM = GlobalInfo::this_()->BoxModelList().at(ModelIndex);
 
     QSharedPointer<PackInfo> pinfo = box->parentPack();
     QJsonObject info = pinfo->info()->toObject();
-    QJsonObject obj =  box->toObject();
-    if(pinfo.isNull()) return QImage();
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    QJsonObject obj = box->toObject();
+    if (pinfo.isNull())
+        return QImage();
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(5*5,5*5,90*5,15*5);
-    painter.drawRect(5*5,20*5,90*5,35*5);
-    painter.drawLine(20*5,20*5,20*5,55*5);
-    painter.drawLine(50*5,20*5,50*5,55*5);
-    painter.drawLine(66*5,20*5,66*5,55*5);
-    painter.drawLine(5*5,27*5,95*5,27*5);
-    painter.drawLine(5*5,34*5,95*5,34*5);
-    painter.drawLine(5*5,41*5,95*5,41*5);
-    painter.drawLine(5*5,48*5,95*5,48*5);
-    painter.drawRect(5*5,55*5,90*5,15*5);
-    painter.drawRect(5*5,70*5,90*5,7*5);
-
-    QRect target(0*5, 57*5, 100*5, 65*5);
-//    QRect source(-10*5, 0, 65*5, 40*5);
+    painter.drawRect(5 * 5, 5 * 5, 90 * 5, 15 * 5);
+    painter.drawRect(5 * 5, 20 * 5, 90 * 5, 35 * 5);
+    painter.drawLine(20 * 5, 20 * 5, 20 * 5, 55 * 5);
+    painter.drawLine(50 * 5, 20 * 5, 50 * 5, 55 * 5);
+    painter.drawLine(66 * 5, 20 * 5, 66 * 5, 55 * 5);
+    painter.drawLine(5 * 5, 27 * 5, 95 * 5, 27 * 5);
+    painter.drawLine(5 * 5, 34 * 5, 95 * 5, 34 * 5);
+    painter.drawLine(5 * 5, 41 * 5, 95 * 5, 41 * 5);
+    painter.drawLine(5 * 5, 48 * 5, 95 * 5, 48 * 5);
+    painter.drawRect(5 * 5, 55 * 5, 90 * 5, 15 * 5);
+    painter.drawRect(5 * 5, 70 * 5, 90 * 5, 7 * 5);
+
+    QRect target(0 * 5, 57 * 5, 100 * 5, 65 * 5);
+    //    QRect source(-10*5, 0, 65*5, 40*5);
     QString bar = box->caseNumber();
-    code.draw(painter,target,bar);
-//    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
+    code.draw(painter, target, bar);
+    //    painter.drawImage(target,barCode.draw(barCode.CodeBinary(bar),bar),source);
 
-    painter.setRenderHint(QPainter::Antialiasing,true);
-    painter.setRenderHint(QPainter::TextAntialiasing,true);
-    painter.setRenderHint(QPainter::HighQualityAntialiasing,true);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setRenderHint(QPainter::TextAntialiasing, true);
+    painter.setRenderHint(QPainter::HighQualityAntialiasing, true);
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(40);
     font.setWeight(QFont::ExtraLight);
-    painter.setFont(font);font.setPixelSize(20);
+    painter.setFont(font);
+    font.setPixelSize(20);
     font.setBold(true);
-    painter.drawText(6*5,15*5,box->parentPack()->customer);
+    painter.drawText(6 * 5, 15 * 5, box->parentPack()->customer);
 
     font.setPixelSize(20);
     font.setBold(true);
     painter.setFont(font);
-//    painter.drawText(8*5,25*5,boxM->text1_1);
-//    painter.drawText(53*5,25*5,boxM->text1_2);
-//    painter.drawText(8*5,32*5,boxM->text2_1);
-//    painter.drawText(53*5,32*5,boxM->text2_2);
-//    painter.drawText(8*5,39*5,boxM->text3_1);
-//    painter.drawText(53*5,39*5,boxM->text3_2);
-//    painter.drawText(8*5,46*5,boxM->text4_1);
-//    painter.drawText(53*5,46*5,boxM->text4_2);
-//    painter.drawText(8*5,53*5,boxM->text5_1);
-//    painter.drawText(50*5,53*5,boxM->text5_2);
-
-    painter.drawText(8*5,25*5,boxM->Type_Name.at(0).toString());
-    painter.drawText(53*5,25*5,boxM->Type_Name.at(5).toString());
-    painter.drawText(8*5,32*5,boxM->Type_Name.at(1).toString());
-    painter.drawText(53*5,32*5,boxM->Type_Name.at(6).toString());
-    painter.drawText(8*5,39*5,boxM->Type_Name.at(2).toString());
-    painter.drawText(53*5,39*5,boxM->Type_Name.at(7).toString());
-    painter.drawText(8*5,46*5,boxM->Type_Name.at(3).toString());
-    painter.drawText(53*5,46*5,boxM->Type_Name.at(8).toString());
-    painter.drawText(8*5,53*5,boxM->Type_Name.at(4).toString());
-    painter.drawText(53*5,53*5,boxM->Type_Name.at(9).toString());
-//    painter.drawText(50*5,53*5,boxM->Type_Name.at(9).toString());
-
-
-
-    painter.drawText(21*5,25*5,FindData(box,boxM->Type_Data.at(0).toString()));
-    painter.drawText(21*5,32*5,FindData(box,boxM->Type_Data.at(1).toString()));
-    painter.drawText(21*5,39*5,FindData(box,boxM->Type_Data.at(2).toString()));
-    painter.drawText(21*5,46*5,FindData(box,boxM->Type_Data.at(3).toString()));
-    painter.drawText(21*5,53*5,FindData(box,boxM->Type_Data.at(4).toString()));
-    painter.drawText(67*5,25*5,FindData(box,boxM->Type_Data.at(5).toString()));//datalist.at(0));
-    painter.drawText(67*5,32*5,FindData(box,boxM->Type_Data.at(6).toString()));
-    painter.drawText(67*5,39*5,FindData(box,boxM->Type_Data.at(7).toString()));//datalist.at(2));
-    painter.drawText(67*5,46*5,FindData(box,boxM->Type_Data.at(8).toString()));//datalist.at(4));
-    painter.drawText(67*5,53*5,FindData(box,boxM->Type_Data.at(9).toString()));//datalist.at(6));
+    //    painter.drawText(8*5,25*5,boxM->text1_1);
+    //    painter.drawText(53*5,25*5,boxM->text1_2);
+    //    painter.drawText(8*5,32*5,boxM->text2_1);
+    //    painter.drawText(53*5,32*5,boxM->text2_2);
+    //    painter.drawText(8*5,39*5,boxM->text3_1);
+    //    painter.drawText(53*5,39*5,boxM->text3_2);
+    //    painter.drawText(8*5,46*5,boxM->text4_1);
+    //    painter.drawText(53*5,46*5,boxM->text4_2);
+    //    painter.drawText(8*5,53*5,boxM->text5_1);
+    //    painter.drawText(50*5,53*5,boxM->text5_2);
+
+    painter.drawText(8 * 5, 25 * 5, boxM->Type_Name.at(0).toString());
+    painter.drawText(53 * 5, 25 * 5, boxM->Type_Name.at(5).toString());
+    painter.drawText(8 * 5, 32 * 5, boxM->Type_Name.at(1).toString());
+    painter.drawText(53 * 5, 32 * 5, boxM->Type_Name.at(6).toString());
+    painter.drawText(8 * 5, 39 * 5, boxM->Type_Name.at(2).toString());
+    painter.drawText(53 * 5, 39 * 5, boxM->Type_Name.at(7).toString());
+    painter.drawText(8 * 5, 46 * 5, boxM->Type_Name.at(3).toString());
+    painter.drawText(53 * 5, 46 * 5, boxM->Type_Name.at(8).toString());
+    painter.drawText(8 * 5, 53 * 5, boxM->Type_Name.at(4).toString());
+    painter.drawText(53 * 5, 53 * 5, boxM->Type_Name.at(9).toString());
+    //    painter.drawText(50*5,53*5,boxM->Type_Name.at(9).toString());
+
+    painter.drawText(21 * 5, 25 * 5, FindData(box, boxM->Type_Data.at(0).toString()));
+    painter.drawText(21 * 5, 32 * 5, FindData(box, boxM->Type_Data.at(1).toString()));
+    painter.drawText(21 * 5, 39 * 5, FindData(box, boxM->Type_Data.at(2).toString()));
+    painter.drawText(21 * 5, 46 * 5, FindData(box, boxM->Type_Data.at(3).toString()));
+    painter.drawText(21 * 5, 53 * 5, FindData(box, boxM->Type_Data.at(4).toString()));
+    painter.drawText(67 * 5,
+                     25 * 5,
+                     FindData(box, boxM->Type_Data.at(5).toString())); // datalist.at(0));
+    painter.drawText(67 * 5, 32 * 5, FindData(box, boxM->Type_Data.at(6).toString()));
+    painter.drawText(67 * 5,
+                     39 * 5,
+                     FindData(box, boxM->Type_Data.at(7).toString())); // datalist.at(2));
+    painter.drawText(67 * 5,
+                     46 * 5,
+                     FindData(box, boxM->Type_Data.at(8).toString())); // datalist.at(4));
+    painter.drawText(67 * 5,
+                     53 * 5,
+                     FindData(box, boxM->Type_Data.at(9).toString())); // datalist.at(6));
 
     font.setPixelSize(17);
     painter.setFont(font);
 
+    painter.drawText(QRect(4 * 5, 75 * 5, 100 * 5, 65 * 5),
+                     Qt::AlignCenter,
+                     "服务电话:" + box->parentPack()->telephone);
 
-    painter.drawText(QRect(4*5,75*5, 100*5, 65*5), Qt::AlignCenter, "服务电话:"+ box->parentPack()->telephone);
-
-//    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-//        image.save(path+"/xiangdan/code"+bar+".bmp");
+    //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
+    //        image.save(path+"/xiangdan/code"+bar+".bmp");
     return image;
 }
 
-QString BoxTemlateOne::FindData(QSharedPointer<BoxInfo> box,QString data){
-
+QString BoxTemlateOne::FindData(QSharedPointer<BoxInfo> box, QString data)
+{
     QSharedPointer<PackInfo> pinfo = box->parentPack();
-//    QJsonObject info = pinfo->info()->toObject();
-//    QJsonObject obj =  box->toObject();
-    if(data=="品名"){
+    //    QJsonObject info = pinfo->info()->toObject();
+    //    QJsonObject obj =  box->toObject();
+    if (data == "品名") {
         return pinfo->info()->product_type_code;
-    }else if(data=="批号"){
+    } else if (data == "批号") {
         return pinfo->info()->batch_no;
-    }else if(data=="规格"){
+    } else if (data == "规格") {
         return pinfo->info()->specs;
-    }else if(data=="毛重"){
-        return QString("%1 kg").arg(getDecimalbit( box->gross_weight / 1000.00));
-    }else if(data=="净重"){
+    } else if (data == "毛重") {
+        return QString("%1 kg").arg(getDecimalbit(box->gross_weight / 1000.00));
+    } else if (data == "净重") {
         return QString("%1 kg").arg(getDecimalbit(box->net_weight / 1000.00));
-    }else if(data=="筒数"){
+    } else if (data == "筒数") {
         return QString::number(box->tube_number);
-    }else if(data=="等级"){
+    } else if (data == "等级") {
         return box->Level;
-    }else if(data=="捻向"){
+    } else if (data == "捻向") {
         return box->twist_type;
-    }else if(data=="管色"){
+    } else if (data == "管色") {
         return box->bucket_color;
-    }else if(data=="箱号"){
+    } else if (data == "箱号") {
         return box->caseNumber();
-    }else if(data=="类型"){
+    } else if (data == "类型") {
         return pinfo->info()->category;
-    }else if(data=="旦数"){
+    } else if (data == "旦数") {
         return pinfo->info()->denier;
-    }else if(data=="分特"){
+    } else if (data == "分特") {
         return pinfo->info()->dtex;
-    }else if(data=="孔数"){
+    } else if (data == "孔数") {
         return pinfo->info()->fiber;
-    }else if(data=="颜色"){
+    } else if (data == "颜色") {
         return pinfo->info()->color;
-    }else if(data=="皮重"){
+    } else if (data == "皮重") {
         return pinfo->info()->box_weight;
-    }else if(data=="筒重"){
+    } else if (data == "筒重") {
         return pinfo->info()->bucket_weight;
-    }else if(data!="空"){
+    } else if (data != "空") {
         return data;
     }
 
@@ -295,213 +340,216 @@ QString BoxTemlateOne::FindData(QSharedPointer<BoxInfo> box,QString data){
 
 QSize BoxTemlateOne::printSize()
 {
-    return QSize(100,80);
+    return QSize(100, 80);
 }
 
 QImage BoxTemlateOne::Boxmodel()
 {
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(5*5,5*5,90*5,15*5);
-    painter.drawRect(5*5,20*5,90*5,35*5);
-    painter.drawLine(20*5,20*5,20*5,55*5);
-    painter.drawLine(50*5,20*5,50*5,55*5);
-    painter.drawLine(66*5,20*5,66*5,55*5);
-    painter.drawLine(5*5,27*5,95*5,27*5);
-    painter.drawLine(5*5,34*5,95*5,34*5);
-    painter.drawLine(5*5,41*5,95*5,41*5);
-    painter.drawLine(5*5,48*5,95*5,48*5);
-    painter.drawRect(5*5,55*5,90*5,15*5);
-    painter.drawRect(5*5,70*5,90*5,7*5);
-
-    QRect target(0*5, 57*5, 100*5, 65*5);
+    painter.drawRect(5 * 5, 5 * 5, 90 * 5, 15 * 5);
+    painter.drawRect(5 * 5, 20 * 5, 90 * 5, 35 * 5);
+    painter.drawLine(20 * 5, 20 * 5, 20 * 5, 55 * 5);
+    painter.drawLine(50 * 5, 20 * 5, 50 * 5, 55 * 5);
+    painter.drawLine(66 * 5, 20 * 5, 66 * 5, 55 * 5);
+    painter.drawLine(5 * 5, 27 * 5, 95 * 5, 27 * 5);
+    painter.drawLine(5 * 5, 34 * 5, 95 * 5, 34 * 5);
+    painter.drawLine(5 * 5, 41 * 5, 95 * 5, 41 * 5);
+    painter.drawLine(5 * 5, 48 * 5, 95 * 5, 48 * 5);
+    painter.drawRect(5 * 5, 55 * 5, 90 * 5, 15 * 5);
+    painter.drawRect(5 * 5, 70 * 5, 90 * 5, 7 * 5);
+
+    QRect target(0 * 5, 57 * 5, 100 * 5, 65 * 5);
     QString bar = "200324155812001";
-    code.draw(painter,target,bar);
+    code.draw(painter, target, bar);
 
     QFont font;
     font.setPixelSize(40);
     painter.setFont(font);
-    painter.drawText(5*5,15*5,"公司名称");
+    painter.drawText(5 * 5, 15 * 5, "公司名称");
 
     font.setPixelSize(17);
     painter.setFont(font);
-//    painter.drawText(4*5,75*5," 电话:11111111111");
-    painter.drawText(QRect(4*5,75*5, 100*5, 65*5), Qt::AlignCenter, "服务电话:11111111111");
-//    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-//    if(save)
-//        image.save(path+"/xiangdan/code"+"11111"+".bmp");
+    //    painter.drawText(4*5,75*5," 电话:11111111111");
+    painter.drawText(QRect(4 * 5, 75 * 5, 100 * 5, 65 * 5), Qt::AlignCenter, "服务电话:11111111111");
+    //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
+    //    if(save)
+    //        image.save(path+"/xiangdan/code"+"11111"+".bmp");
     return image;
 }
 
-
-PackTemlateOne::PackTemlateOne()
-{}
+PackTemlateOne::PackTemlateOne() {}
 //默认码单
 QImage PackTemlateOne::doPrinter(QSharedPointer<PackInfo> pack)
 {
-    //TODO: 小宋，迁移打印 码单的逻辑
+    // TODO: 小宋，迁移打印 码单的逻辑
 
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(4*5,4*5,92*5,68*5);
+    painter.drawRect(4 * 5, 4 * 5, 92 * 5, 68 * 5);
 
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(30);
     font.setWeight(QFont::ExtraLight);
     painter.setFont(font);
-    painter.drawText(38*5,10*5,QStringLiteral("入 库 单"));
-
+    painter.drawText(38 * 5, 10 * 5, QStringLiteral("入 库 单"));
 
     font.setPixelSize(20);
     painter.setFont(font);
-    painter.drawText(8*5,15*5,QStringLiteral("规格:"));
-    painter.drawText(59*5,15*5,QStringLiteral("类型:"));
-    painter.drawText(8*5,21*5,QStringLiteral("批号:"));
-    painter.drawText(59*5,21*5,QStringLiteral("等级:"));
+    painter.drawText(8 * 5, 15 * 5, QStringLiteral("规格:"));
+    painter.drawText(59 * 5, 15 * 5, QStringLiteral("类型:"));
+    painter.drawText(8 * 5, 21 * 5, QStringLiteral("批号:"));
+    painter.drawText(59 * 5, 21 * 5, QStringLiteral("等级:"));
 
     font.setPixelSize(15);
     painter.setFont(font);
 
-    painter.drawText(8*5,64*5,QStringLiteral("总数"));
-    painter.drawText(38*5,64*5,QStringLiteral("总重量"));
-    painter.drawText(68*5,64*5,QStringLiteral("总筒数"));
+    painter.drawText(8 * 5, 64 * 5, QStringLiteral("总数"));
+    painter.drawText(38 * 5, 64 * 5, QStringLiteral("总重量"));
+    painter.drawText(68 * 5, 64 * 5, QStringLiteral("总筒数"));
 
-//    QFont font;
+    //    QFont font;
     font.setPixelSize(15);
     painter.setFont(font);
-    int boxSize =  pack->boxes().size();
-    for(int i = 0; i < boxSize; ++i){
+    int boxSize = pack->boxes().size();
+    for (int i = 0; i < boxSize; ++i) {
         int line = i / 5;
         int cloun = i % 5;
-        painter.drawText((9 + line * 19)*5,(27 + cloun * 6)*5,QString("%1.").arg(i + 1));
+        painter.drawText((9 + line * 19) * 5, (27 + cloun * 6) * 5, QString("%1.").arg(i + 1));
     }
 
-    QRect target(0*5, 67*5, 100*5, 75*5);
+    QRect target(0 * 5, 67 * 5, 100 * 5, 75 * 5);
     QString bar = pack->codeSingle();
-    code.draw(painter,target,bar);
+    code.draw(painter, target, bar);
     font.setPixelSize(20);
     font.setFamily("黑体");
 
     painter.setFont(font);
-    painter.drawText(19*5,15*5,pack->info()->specs);//QStringLiteral("规格"));
-    painter.drawText(70*5,15*5,pack->info()->category);//QStringLiteral("类型"));
-    painter.drawText(19*5,21*5,pack->info()->batch_no);//QStringLiteral("批号"));
-    painter.drawText(70*5,21*5,pack->level);//info.at(0));
-    for(int i = 0; i < boxSize; ++i)
-    {
+    painter.drawText(19 * 5, 15 * 5, pack->info()->specs);    // QStringLiteral("规格"));
+    painter.drawText(70 * 5, 15 * 5, pack->info()->category); // QStringLiteral("类型"));
+    painter.drawText(19 * 5, 21 * 5, pack->info()->batch_no); // QStringLiteral("批号"));
+    painter.drawText(70 * 5, 21 * 5, pack->level);            // info.at(0));
+    for (int i = 0; i < boxSize; ++i) {
         QString code = getDecimalbit(pack->boxes().at(i)->net_weight / 1000.00);
         int line = i / 5;
         int cloun = i % 5;
-        painter.drawText((13 + line * 19)*5,(27.5 + cloun * 6 )*5 ,code);
+        painter.drawText((13 + line * 19) * 5, (27.5 + cloun * 6) * 5, code);
     }
 
-    painter.drawText(15*5,64*5,QString::number(pack->boxes().size()));
-    painter.drawText(48*5,64*5,QString("%1 kg").arg(getDecimalbit(pack->net_weight() / 1000.00)));
-    painter.drawText(78*5,64*5,QString::number(pack->tube_number()));
+    painter.drawText(15 * 5, 64 * 5, QString::number(pack->boxes().size()));
+    painter.drawText(48 * 5,
+                     64 * 5,
+                     QString("%1 kg").arg(getDecimalbit(pack->net_weight() / 1000.00)));
+    painter.drawText(78 * 5, 64 * 5, QString::number(pack->tube_number()));
 
-//    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-//        image.save(path+"/rukudan/code"+bar+".bmp");
+    //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
+    //        image.save(path+"/rukudan/code"+bar+".bmp");
 
     return image;
 }
 
 QImage PackTemlateOne::doPrinter(QSharedPointer<PackInfo> pack, int ModelIndex)
 {
-    //TODO: 小宋，迁移打印 码单的逻辑
+    // TODO: 小宋，迁移打印 码单的逻辑
 
     packM = GlobalInfo::this_()->PackModelList().at(ModelIndex);
 
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(4*5,4*5,92*5,68*5);
+    painter.drawRect(4 * 5, 4 * 5, 92 * 5, 68 * 5);
 
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(30);
     font.setWeight(QFont::ExtraLight);
     painter.setFont(font);
-    painter.drawText(38*5,10*5,QStringLiteral("入 库 单"));
-
+    painter.drawText(38 * 5, 10 * 5, QStringLiteral("入 库 单"));
 
     font.setPixelSize(20);
     painter.setFont(font);
-    painter.drawText(8*5,15*5,packM->Type_Name.at(0).toString());
-    painter.drawText(59*5,15*5,packM->Type_Name.at(1).toString());
-    painter.drawText(8*5,21*5,packM->Type_Name.at(2).toString());
-    painter.drawText(59*5,21*5,packM->Type_Name.at(3).toString());
+    painter.drawText(8 * 5, 15 * 5, packM->Type_Name.at(0).toString());
+    painter.drawText(59 * 5, 15 * 5, packM->Type_Name.at(1).toString());
+    painter.drawText(8 * 5, 21 * 5, packM->Type_Name.at(2).toString());
+    painter.drawText(59 * 5, 21 * 5, packM->Type_Name.at(3).toString());
 
     font.setPixelSize(15);
     painter.setFont(font);
 
-    painter.drawText(8*5,64*5,packM->Type_Name.at(4).toString());
-    painter.drawText(38*5,64*5,packM->Type_Name.at(5).toString());
-    painter.drawText(68*5,64*5,packM->Type_Name.at(6).toString());
+    painter.drawText(8 * 5, 64 * 5, packM->Type_Name.at(4).toString());
+    painter.drawText(38 * 5, 64 * 5, packM->Type_Name.at(5).toString());
+    painter.drawText(68 * 5, 64 * 5, packM->Type_Name.at(6).toString());
 
-//    QFont font;
+    //    QFont font;
     font.setPixelSize(15);
     painter.setFont(font);
-    int boxSize =  pack->boxes().size();
-    for(int i = 0; i < boxSize; ++i){
+    int boxSize = pack->boxes().size();
+    for (int i = 0; i < boxSize; ++i) {
         int line = i / 5;
         int cloun = i % 5;
-        painter.drawText((9 + line * 19)*5,(27 + cloun * 6)*5,QString("%1.").arg(i + 1));
+        painter.drawText((9 + line * 19) * 5, (27 + cloun * 6) * 5, QString("%1.").arg(i + 1));
     }
 
-    QRect target(0*5, 67*5, 100*5, 75*5);
+    QRect target(0 * 5, 67 * 5, 100 * 5, 75 * 5);
     QString bar = pack->codeSingle();
-    code.draw(painter,target,bar);
+    code.draw(painter, target, bar);
     font.setPixelSize(20);
     font.setFamily("黑体");
 
     painter.setFont(font);
-    painter.drawText(19*5,15*5,FindData(pack,packM->Type_Data.at(0).toString()));//QStringLiteral("规格"));
-    painter.drawText(70*5,15*5,FindData(pack,packM->Type_Data.at(1).toString()));//QStringLiteral("类型"));
-    painter.drawText(19*5,21*5,FindData(pack,packM->Type_Data.at(2).toString()));//QStringLiteral("批号"));
-    painter.drawText(70*5,21*5,FindData(pack,packM->Type_Data.at(3).toString()));//info.at(0));
-    for(int i = 0; i < boxSize; ++i)
-    {
-        QString code = Find20Data(pack,packM->Type_Data.at(4).toString(),i);
+    painter.drawText(19 * 5,
+                     15 * 5,
+                     FindData(pack, packM->Type_Data.at(0).toString())); // QStringLiteral("规格"));
+    painter.drawText(70 * 5,
+                     15 * 5,
+                     FindData(pack, packM->Type_Data.at(1).toString())); // QStringLiteral("类型"));
+    painter.drawText(19 * 5,
+                     21 * 5,
+                     FindData(pack, packM->Type_Data.at(2).toString())); // QStringLiteral("批号"));
+    painter.drawText(70 * 5,
+                     21 * 5,
+                     FindData(pack, packM->Type_Data.at(3).toString())); // info.at(0));
+    for (int i = 0; i < boxSize; ++i) {
+        QString code = Find20Data(pack, packM->Type_Data.at(4).toString(), i);
         int line = i / 5;
         int cloun = i % 5;
-        painter.drawText((13 + line * 19)*5,(27.5 + cloun * 6 )*5 ,code);
+        painter.drawText((13 + line * 19) * 5, (27.5 + cloun * 6) * 5, code);
     }
 
-    painter.drawText(15*5,64*5,FindData(pack,packM->Type_Data.at(5).toString()));
-    painter.drawText(48*5,64*5,FindData(pack,packM->Type_Data.at(6).toString()));
-    painter.drawText(78*5,64*5,FindData(pack,packM->Type_Data.at(7).toString()));
+    painter.drawText(15 * 5, 64 * 5, FindData(pack, packM->Type_Data.at(5).toString()));
+    painter.drawText(48 * 5, 64 * 5, FindData(pack, packM->Type_Data.at(6).toString()));
+    painter.drawText(78 * 5, 64 * 5, FindData(pack, packM->Type_Data.at(7).toString()));
 
-//    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
-//        image.save(path+"/rukudan/code"+bar+".bmp");
+    //    QString path = PQ::PQLogManger::this_()->getSaveFilePath();
+    //        image.save(path+"/rukudan/code"+bar+".bmp");
 
     return image;
 }
 
 QImage PackTemlateOne::Packmodel()
 {
-    QSize size(MAXWIDTH*5,MAXHEIGHT*5);
-    QImage image(size,QImage::Format_ARGB32);
+    QSize size(MAXWIDTH * 5, MAXHEIGHT * 5);
+    QImage image(size, QImage::Format_ARGB32);
     image.fill(qRgba(255, 255, 255, 255));
     QPainter painter(&image);
-    painter.drawRect(4*5,4*5,92*5,68*5);
+    painter.drawRect(4 * 5, 4 * 5, 92 * 5, 68 * 5);
 
     QFont font;
     font.setFamily("宋体");
     font.setPixelSize(30);
     font.setWeight(QFont::ExtraLight);
     painter.setFont(font);
-    painter.drawText(38*5,10*5,QStringLiteral("入 库 单"));
+    painter.drawText(38 * 5, 10 * 5, QStringLiteral("入 库 单"));
 
-
-    QRect target(0*5, 67*5, 100*5, 75*5);
+    QRect target(0 * 5, 67 * 5, 100 * 5, 75 * 5);
     QString bar = "0000200313170054032";
-    code.draw(painter,target,bar);
+    code.draw(painter, target, bar);
     font.setPixelSize(20);
     font.setFamily("黑体");
 
@@ -510,41 +558,41 @@ QImage PackTemlateOne::Packmodel()
 
 QString PackTemlateOne::FindData(QSharedPointer<PackInfo> pack, QString data)
 {
-    if(data=="批号"){
+    if (data == "批号") {
         return pack->info()->batch_no;
-    }else if(data=="类型"){
+    } else if (data == "类型") {
         return pack->info()->category;
-    }else if(data=="品种"){
+    } else if (data == "品种") {
         return pack->info()->product_type_code;
-    }else if(data=="旦数"){
+    } else if (data == "旦数") {
         return pack->info()->denier;
-    }else if(data=="分特"){
+    } else if (data == "分特") {
         return pack->info()->dtex;
-    }else if(data=="等级"){
+    } else if (data == "等级") {
         return pack->level;
-    }else if(data=="孔数"){
+    } else if (data == "孔数") {
         return pack->info()->fiber;
-    }else if(data=="规格"){
+    } else if (data == "规格") {
         return pack->info()->specs;
-    }else if(data=="颜色"){
+    } else if (data == "颜色") {
         return pack->info()->color;
-    }else if(data=="捻向"){
+    } else if (data == "捻向") {
         return pack->info()->twist_type;
-    }else if(data=="管色"){
+    } else if (data == "管色") {
         return pack->info()->bucket_color;
-    }else if(data=="皮重"){
+    } else if (data == "皮重") {
         return pack->info()->box_weight;
-    }else if(data=="机台"){
+    } else if (data == "机台") {
         return pack->info()->machine_no;
-    }else if(data=="纸箱"){
+    } else if (data == "纸箱") {
         return pack->info()->carton_type;
-    }else if(data=="总筒数"){
+    } else if (data == "总筒数") {
         return QString::number(pack->tube_number());
-    }else if(data=="总毛重"){
+    } else if (data == "总毛重") {
         return QString("%1 kg").arg(getDecimalbit(pack->gross_weight() / 1000.00));
-    }else if(data=="总净重"){
+    } else if (data == "总净重") {
         return QString("%1 kg").arg(getDecimalbit(pack->net_weight() / 1000.00));
-    }else if(data!="空"){
+    } else if (data != "空") {
         return data;
     }
 
@@ -553,21 +601,21 @@ QString PackTemlateOne::FindData(QSharedPointer<PackInfo> pack, QString data)
 
 QString PackTemlateOne::Find20Data(QSharedPointer<PackInfo> pack, QString data, int index)
 {
-    if(data=="毛重"){
+    if (data == "毛重") {
         return QString("%1 kg").arg(getDecimalbit(pack->boxInfoAt(index)->gross_weight / 1000.00));
-    }else if(data=="净重"){
+    } else if (data == "净重") {
         return QString("%1 kg").arg(getDecimalbit(pack->boxInfoAt(index)->net_weight / 1000.00));
-    }else if(data=="筒重"){
+    } else if (data == "筒重") {
         return QString::number(pack->boxInfoAt(index)->tube_number);
-    }else if(data=="捻向"){
+    } else if (data == "捻向") {
         return pack->boxInfoAt(index)->twist_type;
-    }else if(data=="管色"){
+    } else if (data == "管色") {
         return pack->boxInfoAt(index)->bucket_color;
-    }else if(data=="总筒重"){
+    } else if (data == "总筒重") {
         return QString("%1 kg").arg(getDecimalbit(pack->boxInfoAt(index)->bucket_weight / 1000.00));
-    }else if(data=="筒数"){
+    } else if (data == "筒数") {
         return QString::number(pack->boxInfoAt(index)->tube_number);
-    }else if(data!="空"){
+    } else if (data != "空") {
         return data;
     }
 
@@ -576,10 +624,5 @@ QString PackTemlateOne::Find20Data(QSharedPointer<PackInfo> pack, QString data,
 
 QSize PackTemlateOne::printSize()
 {
-    return QSize(100,80);
+    return QSize(100, 80);
 }
-
-
-
-
-

struct_/packinfo.h

@@ -1,12 +1,12 @@
 #ifndef PACKINFO_H
 #define PACKINFO_H
 
-#include <QString>
-#include <QSharedPointer>
-#include "projectinfo.h"
 #include "QJsonArray"
+#include "projectinfo.h"
+#include <QSharedPointer>
+#include <QString>
 
-QString getDecimalbit(double v,int i = 2);
+QString getDecimalbit(double v, int i = 2);
 
 class PackInfo;
 
@@ -23,30 +23,28 @@ struct RuKuInfo
 
 struct BoxInfo
 {
-    inline QSharedPointer<PackInfo> parentPack() {
-        return parent.toStrongRef();
-    }
-
-    inline QString caseNumber() {return case_number;}
+    inline QSharedPointer<PackInfo> parentPack() { return parent.toStrongRef(); }
 
-    int  box_weight = 0;//	是	int	皮重 单位:克
-    int  tube_number = 0;//	是	int	筒数
-    int  bucket_weight = 0;//	是	int	总筒重 单位:克
-    int gross_weight = 0;//	是	int	毛重 单位:克
-    int net_weight = 0;//	是	int	净重 单位:克
-    QString Level;//等级;
-    QString twist_type;//	string	捻向
-    QString bucket_color;//	string	管色
-    QString sort;//	是	string	排序
-    QString remark;//	否	string	备注
+    inline QString caseNumber() { return case_number; }
 
+    int box_weight = 0;    //	是	int	皮重 单位:克
+    int tube_number = 0;   //	是	int	筒数
+    int bucket_weight = 0; //	是	int	总筒重 单位:克
+    int gross_weight = 0;  //	是	int	毛重 单位:克
+    int net_weight = 0;    //	是	int	净重 单位:克
+    QString Level;         //等级;
+    QString twist_type;    //	string	捻向
+    QString bucket_color;  //	string	管色
+    QString sort;          //	是	string	排序
+    QString remark;        //	否	string	备注
 
     QJsonObject toObject();
 
-    static QSharedPointer<BoxInfo> fromObject(QSharedPointer<PackInfo> & pack, QJsonObject &obj);
-    BoxInfo(QSharedPointer<PackInfo> pack,QString code);
+    static QSharedPointer<BoxInfo> fromObject(QSharedPointer<PackInfo> &pack, QJsonObject &obj);
+    BoxInfo(QSharedPointer<PackInfo> pack, QString code);
+
 private:
-    QString case_number;//	是	string	箱号
+    QString case_number; //	是	string	箱号
     QWeakPointer<PackInfo> parent;
     friend class PackInfo;
 };
@@ -56,37 +54,38 @@ Q_DECLARE_METATYPE(QSharedPointer<BoxInfo>);
 class PackInfo : public QEnableSharedFromThis<PackInfo>
 {
 public:
-    PackInfo(const QSharedPointer<ProjectInfo> & info);
+    PackInfo(const QSharedPointer<ProjectInfo> &info);
 
-    int quantity = 0;//	是	int	箱数
-    int level_id = 0;//	是	int	等级ID
+    int quantity = 0; //	是	int	箱数
+    int level_id = 0; //	是	int	等级ID
     QString level;
-    QString machine_no;//	是	string	机台
-    QString packing_time;//	是	string	打包时间
-    QString packing_type;//	是	string	打包类型
-    QString carton_type;//	是	string	纸箱
-    QString operator_id;//	是	int	操作员ID
-    QString batch_no;//批号
-    bool autoRuku;//    打包及入库是否点击
-    int warehouse_id = 0;//仓库id
+    QString machine_no;   //	是	string	机台
+    QString packing_time; //	是	string	打包时间
+    QString packing_type; //	是	string	打包类型
+    QString carton_type;  //	是	string	纸箱
+    QString operator_id;  //	是	int	操作员ID
+    QString batch_no;     //批号
+    bool autoRuku;        //    打包及入库是否点击
+    int warehouse_id = 0; //仓库id
 
-    QString remark;//	否	string
+    QString remark; //	否	string
 
-    QString telephone;// 公司
-    QString customer;// 抬头
+    QString telephone; // 公司
+    QString customer;  // 抬头
+    QString address;
 
-    int packType;//0 定重，1 不定重
+    int packType; // 0 定重，1 不定重
 
-    inline const QList<QSharedPointer<BoxInfo>> & boxes() const {return _boxes;} //array	成品详情
-    inline const QSharedPointer<ProjectInfo> & info() const {return _info;}
-    inline QString codeSingle() const {return code_single;} //string	码单
+    inline const QList<QSharedPointer<BoxInfo>> &boxes() const { return _boxes; } // array	成品详情
+    inline const QSharedPointer<ProjectInfo> &info() const { return _info; }
+    inline QString codeSingle() const { return code_single; } // string	码单
 
-    int tube_number(); //int	筒数
+    int tube_number();  // int	筒数
     int gross_weight(); // 	毛重 单位:克
     int net_weight(); //单位:克
-    int goodsID() {return goods_id;}
+    int goodsID() { return goods_id; }
 
-    inline qint64 time() {return _time;}
+    inline qint64 time() { return _time; }
 
     QSharedPointer<BoxInfo> addBoxInfo();
     void addBoxInfoList(QSharedPointer<BoxInfo> boxes);
@@ -94,18 +93,21 @@ public:
     QSharedPointer<BoxInfo> boxInfoAt(int num);
     int boxInfoSize();
 
-    void upInfo(const QSharedPointer<ProjectInfo> & info){
+    void upInfo(const QSharedPointer<ProjectInfo> &info)
+    {
         _info = info;
-        if(!info.isNull())
+        if (!info.isNull())
             goods_id = info->goods_id;
     }
 
     QJsonObject toObject();
 
     static QSharedPointer<PackInfo> fromObject(QJsonObject &obj);
+
 private:
     QString buildPackId();
     QString buildBoxId();
+
 private:
     QList<QSharedPointer<BoxInfo>> _boxes;
     QSharedPointer<ProjectInfo> _info;

struct_/projectinfo.h

@@ -1,9 +1,9 @@
 #ifndef PROJECTINFO_H
 #define PROJECTINFO_H
 
-#include <QString>
-#include <QSharedPointer>
 #include <QJsonObject>
+#include <QSharedPointer>
+#include <QString>
 
 struct UserInfo
 {
@@ -14,48 +14,47 @@ struct UserInfo
     QString headPortrait;
     bool isVip;
     QString acessToken;
-
 };
 
 struct ProjectInfo
 {
-    int goods_id = -1;//	int	商品ID
-    QString batch_no;//	string	批号
-    QString category;//	string	类型
-    QString product_type_code;//	string	品种
-    QString spec_role;//	string	规格录入
-    QString denier;//	string	旦数(D)
-    QString dtex;//	string	分特(dt)
-    QString fiber;//	string	孔数(F)
-    QString specs;//	string	规格
-    QString color;//	string	颜色
-    QString twist_type;//	string	捻向
-    QString bucket_color;//	string	管色
-    QString box_weight;//	string	皮重
-    QString bucket_weight;//	string	筒重
-    QString machine_no;//	string	机台
-    QString carton_type;//	string	纸箱
-    QString limit_number;//	string	限制打包*
-    QString bucket_number;//	string	筒数
-    QString cake_float;//	string	丝饼浮动*
-    QString box_float;//	string	纸箱浮动*
-    QString box_rule;//	string	箱号规则*
-    QString customer;//	string	箱单抬头
-    QString tel;//电话
-    QString remark;//	string	备注*
-    bool is_disable;//	bool	是否禁用*
-    qint64 create_time;//	int	创建时间*
-    qint64 modified_time;//	int	更新时间*
+    int goods_id = -1;         //	int	商品ID
+    QString batch_no;          //	string	批号
+    QString category;          //	string	类型
+    QString product_type_code; //	string	品种
+    QString spec_role;         //	string	规格录入
+    QString denier;            //	string	旦数(D)
+    QString dtex;              //	string	分特(dt)
+    QString fiber;             //	string	孔数(F)
+    QString specs;             //	string	规格
+    QString color;             //	string	颜色
+    QString twist_type;        //	string	捻向
+    QString bucket_color;      //	string	管色
+    QString box_weight;        //	string	皮重
+    QString bucket_weight;     //	string	筒重
+    QString machine_no;        //	string	机台
+    QString carton_type;       //	string	纸箱
+    QString limit_number;      //	string	限制打包*
+    QString bucket_number;     //	string	筒数
+    QString cake_float;        //	string	丝饼浮动*
+    QString box_float;         //	string	纸箱浮动*
+    QString box_rule;          //	string	箱号规则*
+    QString customer;          //	string	箱单抬头
+    QString tel;               //电话
+    QString address;           //电话
+    QString remark;            //	string	备注*
+    bool is_disable;           //	bool	是否禁用*
+    qint64 create_time;        //	int	创建时间*
+    qint64 modified_time;      //	int	更新时间*
 
     QJsonObject toObject();
 
     bool isLocal = false;
 
-    static  QSharedPointer<ProjectInfo> fromObject(const QJsonObject & obj);
-//    QString telephone;//
+    static QSharedPointer<ProjectInfo> fromObject(const QJsonObject &obj);
+    //    QString telephone;//
 };
 
-
 Q_DECLARE_METATYPE(QSharedPointer<ProjectInfo>);
 
 #endif // PROJECTINFO_H

widget/fixedweightpackform.cpp

@@ -1,33 +1,40 @@
 #include "fixedweightpackform.h"
+#include "editboxinfodialog.h"
 #include "ui_fixedweightpackform.h"
 #include <pqQtlib/utils/pqfileutils.h>
-#include "editboxinfodialog.h"
 
 using namespace PQ;
 
-FixedWeightPackForm::FixedWeightPackForm(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::FixedWeightPackForm),packServer(nullptr),Manger(nullptr)
+FixedWeightPackForm::FixedWeightPackForm(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::FixedWeightPackForm)
+    , packServer(nullptr)
+    , Manger(nullptr)
 {
     ui->setupUi(this);
-//    QTimer *timer = new QTimer(this);
-//    connect(timer,&QTimer::timeout,this,&FixedWeightPackForm::calcData);
-//    timer->start(500);
-    connect(glo,&GlobalInfo::dbConfigUpdated,this,&FixedWeightPackForm::upconfig);
-    connect(glo,&GlobalInfo::dengJiUped,this,&FixedWeightPackForm::upDengjiInfo);
-    connect(glo,&GlobalInfo::doInited,this,&FixedWeightPackForm::changeSpecs);
-    connect(glo,&GlobalInfo::selectproject,this,&FixedWeightPackForm::changeSpecs);
-    connect(glo,&GlobalInfo::wareUped,this,&FixedWeightPackForm::upWare);
-    connect(glo,&GlobalInfo::boxModelUped,this,&FixedWeightPackForm::upBoxModelList);
-    connect(glo,&GlobalInfo::packModelUpde,this,&FixedWeightPackForm::upPackModelList);
+    //    QTimer *timer = new QTimer(this);
+    //    connect(timer,&QTimer::timeout,this,&FixedWeightPackForm::calcData);
+    //    timer->start(500);
+    connect(glo, &GlobalInfo::dbConfigUpdated, this, &FixedWeightPackForm::upconfig);
+    connect(glo, &GlobalInfo::dengJiUped, this, &FixedWeightPackForm::upDengjiInfo);
+    connect(glo, &GlobalInfo::doInited, this, &FixedWeightPackForm::changeSpecs);
+    connect(glo, &GlobalInfo::selectproject, this, &FixedWeightPackForm::changeSpecs);
+    connect(glo, &GlobalInfo::wareUped, this, &FixedWeightPackForm::upWare);
+    connect(glo, &GlobalInfo::boxModelUped, this, &FixedWeightPackForm::upBoxModelList);
+    connect(glo, &GlobalInfo::packModelUpde, this, &FixedWeightPackForm::upPackModelList);
 
     auto dt = CacheFile::readFile("dingzhongInfo.cache");
     auto list = QString::fromUtf8(dt).split("[,]");
-    if(list.size() == 2){
+    if (list.size() == 2) {
         ui->taitou->setText(list.at(0));
         ui->taiPhone->setText(list.at(1));
     }
-//    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    if (list.size() == 3) {
+        ui->taitou->setText(list.at(0));
+        ui->taiPhone->setText(list.at(1));
+        ui->lineEdit_address->setText(list.at(2));
+    }
+    //    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->dingzhong->setChecked(true);
 
     //初始化快捷键
@@ -45,21 +52,30 @@ void FixedWeightPackForm::calcData()
     double pz = ui->pizhong->currentText().toDouble();
     double tz = ui->tongzhong->currentText().toDouble();
     double ts = ui->tongshu->text().toDouble();
-    if(ui->showMaoZhong->isChecked()){
-        gross_weight = floor((ui->grossWeight_2->text().toDouble()+chengZhongJingDuModel_Num)*100)/100;
-        netNum = floor(((ui->grossWeight_2->text().toDouble() - pz - tz * ts)+chengZhongJingDuModel_Num)*100)/100;
-
-        f_gross_weight = float(floor((gross_weight+f_chengZhongJingDuModel_Num)*10))/10;
-        f_netNum = float(floor((netNum+f_chengZhongJingDuModel_Num)*10))/10;
+    if (ui->showMaoZhong->isChecked()) {
+        gross_weight = floor((ui->grossWeight_2->text().toDouble() + chengZhongJingDuModel_Num)
+                             * 100)
+                       / 100;
+        netNum = floor(((ui->grossWeight_2->text().toDouble() - pz - tz * ts)
+                        + chengZhongJingDuModel_Num)
+                       * 100)
+                 / 100;
+
+        f_gross_weight = float(floor((gross_weight + f_chengZhongJingDuModel_Num) * 10)) / 10;
+        f_netNum = float(floor((netNum + f_chengZhongJingDuModel_Num) * 10)) / 10;
 
     } else {
-        netNum = floor((ui->grossWeight_2->text().toDouble()+chengZhongJingDuModel_Num)*100)/100;
-        gross_weight = floor(((ui->grossWeight_2->text().toDouble() + pz + tz*ts)+chengZhongJingDuModel_Num)*100)/100;
+        netNum = floor((ui->grossWeight_2->text().toDouble() + chengZhongJingDuModel_Num) * 100)
+                 / 100;
+        gross_weight = floor(((ui->grossWeight_2->text().toDouble() + pz + tz * ts)
+                              + chengZhongJingDuModel_Num)
+                             * 100)
+                       / 100;
 
-        f_gross_weight = float(floor((gross_weight+f_chengZhongJingDuModel_Num)*10))/10;
-        f_netNum = float(floor((netNum+f_chengZhongJingDuModel_Num)*10))/10;
+        f_gross_weight = float(floor((gross_weight + f_chengZhongJingDuModel_Num) * 10)) / 10;
+        f_netNum = float(floor((netNum + f_chengZhongJingDuModel_Num) * 10)) / 10;
     }
-    if(netNum<0){
+    if (netNum < 0) {
         netNum = 0.00;
         f_netNum = 0.0;
     }
@@ -69,133 +85,136 @@ void FixedWeightPackForm::save()
 {
     QStringList list;
 
-    list << ui->taitou->text() <<  ui->taiPhone->text();
-    PQ::CacheFile::writeFile("dingzhongInfo.cache",list.join("[,]").toUtf8());
+    list << ui->taitou->text() << ui->taiPhone->text() << ui->lineEdit_address->text();
+    PQ::CacheFile::writeFile("dingzhongInfo.cache", list.join("[,]").toUtf8());
 
-    if(!packinfo.isNull()){
+    if (!packinfo.isNull()) {
         Manger->savePackInfo(packinfo);
     }
 }
 
 void FixedWeightPackForm::on_addPackList_clicked()
 {
-    if(packinfo.isNull()) return;
-    if(!packinfo.isNull()&&packinfo->boxes().size()>0){
+    if (packinfo.isNull())
+        return;
+    if (!packinfo.isNull() && packinfo->boxes().size() > 0) {
         packinfo->quantity = packinfo->boxes().size();
         packinfo->level_id = ui->dengji->currentData().toInt();
         packinfo->machine_no = ui->jitai->currentText();
         packinfo->carton_type = ui->zhixiang->currentText();
         packinfo->customer = ui->taitou->text();
         packinfo->telephone = ui->taiPhone->text();
+        packinfo->address = ui->lineEdit_address->text();
     }
 
-        packinfo->warehouse_id = 0;
-    if(ui->ruku->isChecked()){
+    packinfo->warehouse_id = 0;
+    if (ui->ruku->isChecked()) {
         packinfo->warehouse_id = ui->wareBox->currentData().toInt();
     }
-    if(ui->AutoSync->isChecked() && !GlobalInfo::this_()->isNoLine())
+    if (ui->AutoSync->isChecked() && !GlobalInfo::this_()->isNoLine())
         packServer->send(packinfo);
     Manger->savePackInfo(packinfo);
-//    GlobalInfo::this_()->packInfoManger()->setPackInfoSync(packinfo->codeSingle(),packinfo->time(),true);
-    if(ui->madanPrint->isChecked()){
-        if(ui->madan->currentIndex() == 0){
+    //    GlobalInfo::this_()->packInfoManger()->setPackInfoSync(packinfo->codeSingle(),packinfo->time(),true);
+    if (ui->madanPrint->isChecked()) {
+        if (ui->madan->currentIndex() == 0) {
             GlobalInfo::this_()->printerPack(packinfo);
-        }else{
-            GlobalInfo::this_()->printerPackModel(packinfo,ui->madan->currentIndex()-1);
+        } else {
+            GlobalInfo::this_()->printerPackModel(packinfo, ui->madan->currentIndex() - 1);
         }
     }
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
 
-//    ui->widget_2->setEnabled(true);
+    //    ui->widget_2->setEnabled(true);
 
     packinfo.clear();
 }
 
 void FixedWeightPackForm::on_addBoxList_clicked()
 {
-    if(ui->grossWeight_2->text().toDouble()<=0){
-        QMessageBox::information(this,tr("注意"),tr("重量异常"));
+    if (ui->grossWeight_2->text().toDouble() <= 0) {
+        QMessageBox::information(this, tr("注意"), tr("重量异常"));
         return;
     }
-    if(ui->tongshu->text().toInt()<=0){
-        QMessageBox::information(this,tr("注意"),tr("筒数异常"));
+    if (ui->tongshu->text().toInt() <= 0) {
+        QMessageBox::information(this, tr("注意"), tr("筒数异常"));
         return;
     }
     calcData();
 
-    if(chengZhongJingDu == 2){
-        if(netNum<=0){
-            QMessageBox::information(this,tr("注意"),tr("重量异常"));
+    if (chengZhongJingDu == 2) {
+        if (netNum <= 0) {
+            QMessageBox::information(this, tr("注意"), tr("重量异常"));
             return;
         }
-    }else if(chengZhongJingDu == 1){
-        if(f_netNum<=0){
-    //        netNum = 0.00;
-            QMessageBox::information(this,tr("注意"),tr("重量异常"));
+    } else if (chengZhongJingDu == 1) {
+        if (f_netNum <= 0) {
+            //        netNum = 0.00;
+            QMessageBox::information(this, tr("注意"), tr("重量异常"));
             return;
         }
     }
 
     checkPackInfo(); //检查packinfo isNull
     //当当前箱数大于等于最大箱数是启动on_addPackList_clicked();
-    if(packinfo->boxes().size() >= ui->comboBox->currentText().toInt()){
+    if (packinfo->boxes().size() >= ui->comboBox->currentText().toInt()) {
         on_addPackList_clicked();
-//        return;
+        //        return;
     }
     checkPackInfo(); //检查packinfo isNull
     auto index = packinfo->boxInfoSize();
     auto box = packinfo->addBoxInfo();
-//    calcData();
-    box->box_weight = int(ui->pizhong->currentText().toDouble()*1000);
+    //    calcData();
+    box->box_weight = int(ui->pizhong->currentText().toDouble() * 1000);
     box->tube_number = ui->tongshu->text().toInt();
-//    box->bucket_weight = int((ui->tongzhong->currentText().toDouble()*ui->tongshu->text().toDouble())*1000);
-    box->bucket_weight = int(floor((ui->tongzhong->currentText().toDouble()*ui->tongshu->text().toDouble()+0.005)*100)*10);
-    if(chengZhongJingDu == 2){
-        box->gross_weight = QString::number(gross_weight*1000).toInt();
-        box->net_weight = QString::number(netNum*1000).toInt();
-    }else if(chengZhongJingDu == 1){
-        box->gross_weight = QString::number(f_gross_weight*1000).toInt();
-        box->net_weight = QString::number(f_netNum*1000).toInt();
+    //    box->bucket_weight = int((ui->tongzhong->currentText().toDouble()*ui->tongshu->text().toDouble())*1000);
+    box->bucket_weight = int(
+        floor((ui->tongzhong->currentText().toDouble() * ui->tongshu->text().toDouble() + 0.005)
+              * 100)
+        * 10);
+    if (chengZhongJingDu == 2) {
+        box->gross_weight = QString::number(gross_weight * 1000).toInt();
+        box->net_weight = QString::number(netNum * 1000).toInt();
+    } else if (chengZhongJingDu == 1) {
+        box->gross_weight = QString::number(f_gross_weight * 1000).toInt();
+        box->net_weight = QString::number(f_netNum * 1000).toInt();
     }
     box->Level = ui->dengji->currentText();
     box->twist_type = ui->nianxiang->currentText();
     box->bucket_color = ui->guanse->currentText();
     box->sort = "1";
-//    box->remark = ui->beizhu->toPlainText();
+    //    box->remark = ui->beizhu->toPlainText();
     packinfo->level = ui->dengji->currentText();
     packinfo->level_id = ui->dengji->currentData().toInt();
     packinfo->autoRuku = ui->ruku->isChecked();
-    addTableWidget(box,index);
+    addTableWidget(box, index);
 
-
-//    把box数据添加到packinfo的boxes数据表里；
+    //    把box数据添加到packinfo的boxes数据表里；
     packinfo->addBoxInfoList(box);
-    if(ui->xiangdanPrint->isChecked()){
-        if(ui->xiangdan->currentText() == "默认箱单"){
+    if (ui->xiangdanPrint->isChecked()) {
+        if (ui->xiangdan->currentText() == "默认箱单") {
             GlobalInfo::this_()->printerBox(box);
-        }else if(ui->xiangdan->currentText() == "默认箱单2"){
+        } else if (ui->xiangdan->currentText() == "默认箱单2") {
             GlobalInfo::this_()->printerBox1(box);
-        }else{
-            GlobalInfo::this_()->printerBoxModel(box,ui->xiangdan->currentIndex()-1);
+        } else {
+            GlobalInfo::this_()->printerBoxModel(box, ui->xiangdan->currentIndex() - 1);
         }
     }
 
-//    if(ui->xiangdanPrint->isChecked()){
-//        if(ui->xiangdan->currentIndex()==0){
-//            GlobalInfo::this_()->printerBox(box);
-//        }
-//    }
-//    qDebug()<<ui->xiangdan->currentIndex();
+    //    if(ui->xiangdanPrint->isChecked()){
+    //        if(ui->xiangdan->currentIndex()==0){
+    //            GlobalInfo::this_()->printerBox(box);
+    //        }
+    //    }
+    //    qDebug()<<ui->xiangdan->currentIndex();
     upSum();
     //添加数据库
-//    aputils.insertDetailsSQL(box,packinfo->codeSingle());
-
+    //    aputils.insertDetailsSQL(box,packinfo->codeSingle());
 }
 
 void FixedWeightPackForm::upSum()
 {
-    if(packinfo.isNull()){
+    if (packinfo.isNull()) {
         ui->labelTongZHong->setText("0");
         ui->labelWight->setText("0");
         ui->labelJing->setText("0");
@@ -209,7 +228,7 @@ void FixedWeightPackForm::upSum()
 //检查packinfo isNull
 void FixedWeightPackForm::checkPackInfo()
 {
-    if(packinfo.isNull()){
+    if (packinfo.isNull()) {
         packinfo.reset(new PackInfo(_info));
         packinfo->operator_id = QString::number(GlobalInfo::this_()->user().userId);
         packinfo->packing_time = QDate::currentDate().toString("yyyy-MM-dd");
@@ -224,12 +243,13 @@ void FixedWeightPackForm::checkPackInfo()
         packinfo->carton_type = ui->zhixiang->currentText();
         packinfo->customer = ui->taitou->text();
         packinfo->telephone = ui->taiPhone->text();
+        packinfo->address = ui->lineEdit_address->text();
 
-//        ui->widget_2->setEnabled(false);
+        //        ui->widget_2->setEnabled(false);
 
         restTableWidget();
     }
-    if(packinfo->goodsID()<0){
+    if (packinfo->goodsID() < 0) {
         packinfo.clear();
     }
 }
@@ -240,27 +260,31 @@ void FixedWeightPackForm::addTableWidget(QSharedPointer<BoxInfo> box, int row)
     ui->nowCode->setText(packinfo->codeSingle());
     ui->tableWidget->insertRow(row);
 
-    ui->tableWidget->setItem(row,0,new QTableWidgetItem(box->caseNumber()));
-    ui->tableWidget->setItem(row,1,new QTableWidgetItem(QString::number(box->tube_number)));
-    ui->tableWidget->setItem(row,2,new QTableWidgetItem(QString::number(box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(row,3,new QTableWidgetItem(ui->tongzhong->currentText()));
-    ui->tableWidget->setItem(row,4,new QTableWidgetItem(box->bucket_color));
-    ui->tableWidget->setItem(row,5,new QTableWidgetItem(QString::number(box->net_weight / 1000.00)));
-    ui->tableWidget->item(row,0)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    ui->tableWidget->item(row,1)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    ui->tableWidget->item(row,2)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    ui->tableWidget->item(row,3)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    ui->tableWidget->item(row,4)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    ui->tableWidget->item(row,5)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+    ui->tableWidget->setItem(row, 0, new QTableWidgetItem(box->caseNumber()));
+    ui->tableWidget->setItem(row, 1, new QTableWidgetItem(QString::number(box->tube_number)));
+    ui->tableWidget->setItem(row,
+                             2,
+                             new QTableWidgetItem(QString::number(box->gross_weight / 1000.00)));
+    ui->tableWidget->setItem(row, 3, new QTableWidgetItem(ui->tongzhong->currentText()));
+    ui->tableWidget->setItem(row, 4, new QTableWidgetItem(box->bucket_color));
+    ui->tableWidget->setItem(row,
+                             5,
+                             new QTableWidgetItem(QString::number(box->net_weight / 1000.00)));
+    ui->tableWidget->item(row, 0)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    ui->tableWidget->item(row, 1)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    ui->tableWidget->item(row, 2)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    ui->tableWidget->item(row, 3)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    ui->tableWidget->item(row, 4)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+    ui->tableWidget->item(row, 5)->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 
     QWidget *tmp_widget = new QWidget();
     tmp_widget->setMaximumWidth(200);
     QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
-    auto btn_1 = new QPushButton("删除",tmp_widget);
+    auto btn_1 = new QPushButton("删除", tmp_widget);
     btn_1->setMaximumWidth(40);
-    auto btn_2 = new QPushButton("修改",tmp_widget);
+    auto btn_2 = new QPushButton("修改", tmp_widget);
     btn_2->setMaximumWidth(40);
-    auto btn_3 = new QPushButton("补打",tmp_widget);
+    auto btn_3 = new QPushButton("补打", tmp_widget);
     btn_3->setMaximumWidth(40);
     tmp_layout->addWidget(btn_1);
     tmp_layout->addWidget(btn_2);
@@ -268,21 +292,21 @@ void FixedWeightPackForm::addTableWidget(QSharedPointer<BoxInfo> box, int row)
     tmp_layout->setSpacing(0);
     tmp_layout->setMargin(0);
     int i = row;
-    connect(btn_1,&QPushButton::clicked,[i,this](){this->del_clicked(i);});
-    connect(btn_2,&QPushButton::clicked,[i,this](){this->edit_clicked(i);});
-    connect(btn_3,&QPushButton::clicked,[i,this](){this->Makeup_clicked(i);});
-    ui->tableWidget->setCellWidget(row,6,tmp_widget);
-//    ui->tableWidget->resizeColumnsToContents();
-    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);    //x先自适应宽度
+    connect(btn_1, &QPushButton::clicked, [i, this]() { this->del_clicked(i); });
+    connect(btn_2, &QPushButton::clicked, [i, this]() { this->edit_clicked(i); });
+    connect(btn_3, &QPushButton::clicked, [i, this]() { this->Makeup_clicked(i); });
+    ui->tableWidget->setCellWidget(row, 6, tmp_widget);
+    //    ui->tableWidget->resizeColumnsToContents();
+    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); // x先自适应宽度
     ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
     ui->tableWidget->horizontalHeader()->setSectionResizeMode(6, QHeaderView::ResizeToContents);
 }
 
 void FixedWeightPackForm::init()
 {
-    if(packServer == nullptr){
+    if (packServer == nullptr) {
         Manger = GlobalInfo::this_()->packInfoManger();
-        packServer = new PackInfoSeed2Server(Manger,this,true);
+        packServer = new PackInfoSeed2Server(Manger, this, true);
     }
     ui->jitai->setCurrentText(_info->machine_no);
     ui->pizhong->setCurrentText(QString(_info->box_weight));
@@ -290,12 +314,15 @@ void FixedWeightPackForm::init()
     ui->zhixiang->setCurrentText(_info->carton_type);
     ui->tongzhong->setCurrentText(_info->bucket_weight);
     ui->nianxiang->setCurrentText(_info->twist_type);
-    if(!_info->customer.isEmpty()){
+    if (!_info->customer.isEmpty()) {
         ui->taitou->setText(_info->customer);
     }
-    if(!_info->tel.isEmpty()){
+    if (!_info->tel.isEmpty()) {
         ui->taiPhone->setText(_info->tel);
     }
+    if (!_info->address.isEmpty()) {
+        ui->lineEdit_address->setText(_info->address);
+    }
     restTableWidget();
 }
 
@@ -310,24 +337,24 @@ void FixedWeightPackForm::upconfig()
     //称重精度方式//4:四舍五入 5：二舍三入 6：一舍二入
     chengZhongJingDuModel = config.chengZhongJingDuMode;
     switch (chengZhongJingDuModel) {
-        case 4:
-            chengZhongJingDuModel_Num = 0.005;
-            f_chengZhongJingDuModel_Num = 0.05;
-            break;
-        case 5:
-            chengZhongJingDuModel_Num = 0.007;
-            f_chengZhongJingDuModel_Num = 0.07;
-            break;
-        case 6:
-            chengZhongJingDuModel_Num = 0.008;
-            f_chengZhongJingDuModel_Num = 0.08;
-            break;
+    case 4:
+        chengZhongJingDuModel_Num = 0.005;
+        f_chengZhongJingDuModel_Num = 0.05;
+        break;
+    case 5:
+        chengZhongJingDuModel_Num = 0.007;
+        f_chengZhongJingDuModel_Num = 0.07;
+        break;
+    case 6:
+        chengZhongJingDuModel_Num = 0.008;
+        f_chengZhongJingDuModel_Num = 0.08;
+        break;
     }
     // 打包及入库
     ui->ruku->setChecked(config.daBaoRuku);
     // 码数
     ui->comboBox->clear();
-    for(int i = 0; i < config.mashu.size(); ++i){
+    for (int i = 0; i < config.mashu.size(); ++i) {
         ui->comboBox->addItem(QString::number(config.mashu.at(i)));
     }
     //机台
@@ -340,7 +367,7 @@ void FixedWeightPackForm::upconfig()
 
     //皮重
     ui->pizhong->clear();
-    for(int i = 0;i<config.xiangzhong.size();i++){
+    for (int i = 0; i < config.xiangzhong.size(); i++) {
         ui->pizhong->addItem(QString::number(config.xiangzhong.at(i)));
     }
 
@@ -358,7 +385,7 @@ void FixedWeightPackForm::upconfig()
 
     //筒重
     ui->tongzhong->clear();
-    for(int i = 0;i<config.tongZhong.size();i++){
+    for (int i = 0; i < config.tongZhong.size(); i++) {
         ui->tongzhong->addItem(QString::number(config.tongZhong.at(i)));
     }
 }
@@ -367,9 +394,9 @@ void FixedWeightPackForm::upDengjiInfo()
 {
     QList<DengJiConfigItem> dengJis = glo->dengJiList();
     ui->dengji->clear();
-    for(int i = 0;i<dengJis.size();i++){
-        if(!dengJis.at(i).isEnable){
-            ui->dengji->addItem(dengJis.at(i).value,dengJis.at(i).id);
+    for (int i = 0; i < dengJis.size(); i++) {
+        if (!dengJis.at(i).isEnable) {
+            ui->dengji->addItem(dengJis.at(i).value, dengJis.at(i).id);
         }
     }
 }
@@ -377,8 +404,8 @@ void FixedWeightPackForm::upDengjiInfo()
 void FixedWeightPackForm::upWare()
 {
     QList<WarehouseConfig> ware = glo->wareList();
-    for(int i = 0;i<ware.size();i++){
-        ui->wareBox->addItem(ware.at(i).name,ware.at(i).warehouse_id);
+    for (int i = 0; i < ware.size(); i++) {
+        ui->wareBox->addItem(ware.at(i).name, ware.at(i).warehouse_id);
     }
 }
 
@@ -388,10 +415,10 @@ void FixedWeightPackForm::upBoxModelList()
     ui->xiangdan->addItem("默认箱单");
     ui->xiangdan->addItem("默认箱单2");
     QList<QSharedPointer<BoxModel>> boxList = glo->BoxModelList();
-    for(int i = 0;i<boxList.size();i++){
+    for (int i = 0; i < boxList.size(); i++) {
         ui->xiangdan->addItem(boxList.at(i)->Model_Name);
     }
-//    ui->xiangdan->setCurrentText("默认箱单2");
+    //    ui->xiangdan->setCurrentText("默认箱单2");
 }
 
 void FixedWeightPackForm::upPackModelList()
@@ -399,17 +426,17 @@ void FixedWeightPackForm::upPackModelList()
     ui->madan->clear();
     ui->madan->addItem("默认码单");
     QList<QSharedPointer<PackModel>> packList = glo->PackModelList();
-    for(int i = 0;i<packList.size();i++){
+    for (int i = 0; i < packList.size(); i++) {
         ui->madan->addItem(packList.at(i)->Model_Name);
     }
 }
 
 void FixedWeightPackForm::on_pushPiLiang_clicked()
 {
-//    int tsize = 0;
-//    if(!packinfo.isNull()) tsize = packinfo->boxes().size();
+    //    int tsize = 0;
+    //    if(!packinfo.isNull()) tsize = packinfo->boxes().size();
     auto size = ui->spinBox->value();
-    for(int i = 0; i < size; ++i){
+    for (int i = 0; i < size; ++i) {
         on_addBoxList_clicked();
     }
 }
@@ -418,7 +445,7 @@ void FixedWeightPackForm::on_pushPiLiang_clicked()
 void FixedWeightPackForm::on_searchButton_clicked()
 {
     auto str = ui->lineEdit->text();
-    if(str.isEmpty()){
+    if (str.isEmpty()) {
         updateTableWidget(prolist);
     } else {
         auto list = GlobalInfo::this_()->searchProject(str);
@@ -432,54 +459,52 @@ void FixedWeightPackForm::changeSpecs()
     updateTableWidget(prolist);
 }
 
-void FixedWeightPackForm::updateTableWidget(QList<QSharedPointer<ProjectInfo>> & list)
+void FixedWeightPackForm::updateTableWidget(QList<QSharedPointer<ProjectInfo>> &list)
 {
     ui->tableWidget_2->clearContents();
     ui->tableWidget_2->setRowCount(0);
 
-
-    ui->tableWidget_2->setColumnWidth(0,40);
-    ui->tableWidget_2->setColumnWidth(1,80);
-    ui->tableWidget_2->setColumnWidth(2,80);
-//    ui->tableWidget_2->setColumnWidth(3,70);
-    ui->tableWidget_2->setColumnWidth(4,40);
+    ui->tableWidget_2->setColumnWidth(0, 40);
+    ui->tableWidget_2->setColumnWidth(1, 80);
+    ui->tableWidget_2->setColumnWidth(2, 80);
+    //    ui->tableWidget_2->setColumnWidth(3,70);
+    ui->tableWidget_2->setColumnWidth(4, 40);
     ui->tableWidget_2->horizontalHeader()->setStretchLastSection(true);
-//    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-
-
+    //    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 
     int currt = -1;
-    for(int i = 0; i < list.size(); ++i){
-        auto & v = list.at(i);
-        if(v->goods_id<0){
+    for (int i = 0; i < list.size(); ++i) {
+        auto &v = list.at(i);
+        if (v->goods_id < 0) {
             continue;
         }
-//        ui->tableWidget_2->insertRow();
-        ui->tableWidget_2->setRowCount(ui->tableWidget_2->rowCount()+1);
-        auto xuanze_btn =  new QRadioButton();
+        //        ui->tableWidget_2->insertRow();
+        ui->tableWidget_2->setRowCount(ui->tableWidget_2->rowCount() + 1);
+        auto xuanze_btn = new QRadioButton();
         QString batchno = prolist.at(i)->batch_no;
-//        qDebug()<<ui->tableWidget_2->rowCount()<<batchno;
-        connect(xuanze_btn,&QPushButton::clicked,[batchno,this](){this->xuanZe_clicked(batchno);});
-        int row = ui->tableWidget_2->rowCount()-1;
-        ui->tableWidget_2->setCellWidget(row,0,xuanze_btn);
-        ui->tableWidget_2->setItem(row,1,new QTableWidgetItem(v->specs));
-        ui->tableWidget_2->setItem(row,2,new QTableWidgetItem(v->category));
-        ui->tableWidget_2->setItem(row,3,new QTableWidgetItem(v->batch_no));
-        ui->tableWidget_2->setItem(row,4,new QTableWidgetItem(v->color));
-        if(!_info.isNull() && _info->batch_no == v->batch_no){
+        //        qDebug()<<ui->tableWidget_2->rowCount()<<batchno;
+        connect(xuanze_btn, &QPushButton::clicked, [batchno, this]() {
+            this->xuanZe_clicked(batchno);
+        });
+        int row = ui->tableWidget_2->rowCount() - 1;
+        ui->tableWidget_2->setCellWidget(row, 0, xuanze_btn);
+        ui->tableWidget_2->setItem(row, 1, new QTableWidgetItem(v->specs));
+        ui->tableWidget_2->setItem(row, 2, new QTableWidgetItem(v->category));
+        ui->tableWidget_2->setItem(row, 3, new QTableWidgetItem(v->batch_no));
+        ui->tableWidget_2->setItem(row, 4, new QTableWidgetItem(v->color));
+        if (!_info.isNull() && _info->batch_no == v->batch_no) {
             xuanze_btn->setChecked(true);
             currt = i;
         }
     }
-    if(currt >= 0)
-        ui->tableWidget_2->setCurrentCell(currt,0);
-
+    if (currt >= 0)
+        ui->tableWidget_2->setCurrentCell(currt, 0);
 }
 
-void FixedWeightPackForm::setProInfo(const QSharedPointer<ProjectInfo> & info)
+void FixedWeightPackForm::setProInfo(const QSharedPointer<ProjectInfo> &info)
 {
     _info = info;
-    if(!packinfo.isNull()){
+    if (!packinfo.isNull()) {
         packinfo->upInfo(_info);
         packinfo->packing_type = _info->category;
     }
@@ -493,13 +518,14 @@ void FixedWeightPackForm::xuanZe_clicked(QString batchno)
     packinfo.clear();
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
-//    ui->tableWidget->clear();
+    //    ui->tableWidget->clear();
     setProInfo(GlobalInfo::this_()->project().value(batchno));
 }
 
 void FixedWeightPackForm::del_clicked(int row)
 {
-    if(packinfo.isNull()) return;
+    if (packinfo.isNull())
+        return;
 
     packinfo->delBoxInfoAt(row);
     restTableWidget();
@@ -510,30 +536,29 @@ void FixedWeightPackForm::restTableWidget()
     ui->tableWidget->clearContents();
     ui->tableWidget->setRowCount(0);
 
-
-//    ui->tableWidget->setColumnWidth(0,200);
-//    ui->tableWidget->setColumnWidth(1,75);
-//    ui->tableWidget->setColumnWidth(2,75);
-//    ui->tableWidget->setColumnWidth(3,75);
-//    ui->tableWidget->setColumnWidth(4,75);
-//    ui->tableWidget->setColumnWidth(5,75);
-
-//    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
-//    ui->tableWidget->setColumnWidth(0,130);
-//    ui->tableWidget->setColumnWidth(1,45);
-//    ui->tableWidget->setColumnWidth(2,45);
-//    ui->tableWidget->setColumnWidth(3,45);
-//    ui->tableWidget->setColumnWidth(4,45);
-//    ui->tableWidget->setColumnWidth(5,45);
-//    ui->tableWidget->resizeColumnToContents(45);
-//    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
-//    ui->tableWidget->resizeColumnToContents(10);
-//    ui->tableWidget->resizeColumnsToContents();
-//    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
-//    ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
-    if(!packinfo.isNull()){
-        for(int i =  0; i < packinfo->boxInfoSize(); ++i){
-            addTableWidget(packinfo->boxInfoAt(i),i);
+    //    ui->tableWidget->setColumnWidth(0,200);
+    //    ui->tableWidget->setColumnWidth(1,75);
+    //    ui->tableWidget->setColumnWidth(2,75);
+    //    ui->tableWidget->setColumnWidth(3,75);
+    //    ui->tableWidget->setColumnWidth(4,75);
+    //    ui->tableWidget->setColumnWidth(5,75);
+
+    //    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
+    //    ui->tableWidget->setColumnWidth(0,130);
+    //    ui->tableWidget->setColumnWidth(1,45);
+    //    ui->tableWidget->setColumnWidth(2,45);
+    //    ui->tableWidget->setColumnWidth(3,45);
+    //    ui->tableWidget->setColumnWidth(4,45);
+    //    ui->tableWidget->setColumnWidth(5,45);
+    //    ui->tableWidget->resizeColumnToContents(45);
+    //    ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    //    ui->tableWidget->resizeColumnToContents(10);
+    //    ui->tableWidget->resizeColumnsToContents();
+    //    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
+    //    ui->tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
+    if (!packinfo.isNull()) {
+        for (int i = 0; i < packinfo->boxInfoSize(); ++i) {
+            addTableWidget(packinfo->boxInfoAt(i), i);
         }
     }
     upSum();
@@ -541,17 +566,18 @@ void FixedWeightPackForm::restTableWidget()
 
 void FixedWeightPackForm::Makeup_clicked(int row)
 {
-    if(packinfo.isNull()) return;
-    auto box =  packinfo->boxInfoAt(row);
+    if (packinfo.isNull())
+        return;
+    auto box = packinfo->boxInfoAt(row);
     GlobalInfo::this_()->printerBox(box);
 }
 
-
 void FixedWeightPackForm::edit_clicked(int row)
 {
-    if(packinfo.isNull()) return;
-    auto box =  packinfo->boxInfoAt(row);
-    EditBoxInfoDialog dig(box,this);
+    if (packinfo.isNull())
+        return;
+    auto box = packinfo->boxInfoAt(row);
+    EditBoxInfoDialog dig(box, this);
     dig.exec();
     restTableWidget();
 }
@@ -560,46 +586,47 @@ void FixedWeightPackForm::on_pushContinue_clicked()
 {
     auto dt = QDate::currentDate();
     auto list = Manger->getPackInfoSync(dt);
-    if(list.isEmpty()){
+    if (list.isEmpty()) {
         dt = dt.addDays(-1);
         list = Manger->getPackInfoSync(dt);
     }
-    if(list.isEmpty()){
-        QMessageBox::warning(this,tr("无可接续码单"),tr("无可接续码单"));
+    if (list.isEmpty()) {
+        QMessageBox::warning(this, tr("无可接续码单"), tr("无可接续码单"));
         return;
     }
-    QList<PackSaveInfo>Plist;
-    for(int i = 0;i<list.size();i++){
-        if(list.at(i).packInfo->batch_no==_info->batch_no){
+    QList<PackSaveInfo> Plist;
+    for (int i = 0; i < list.size(); i++) {
+        if (list.at(i).packInfo->batch_no == _info->batch_no) {
             Plist.append(list.at(i));
         }
     }
-    std::sort(Plist.begin(),Plist.end(),[](const PackSaveInfo & item1, const PackSaveInfo & item2){
+    std::sort(Plist.begin(), Plist.end(), [](const PackSaveInfo &item1, const PackSaveInfo &item2) {
         return item1.packInfo->time() < item2.packInfo->time();
     });
-    if(Plist.isEmpty()){
-        QMessageBox::warning(this,tr("无可接续码单"),tr("无可接续码单"));
+    if (Plist.isEmpty()) {
+        QMessageBox::warning(this, tr("无可接续码单"), tr("无可接续码单"));
         return;
     }
     QSharedPointer<PackInfo> pInfo;
-    for (int i = Plist.size() - 1;i >= 0 ; --i) {
-        auto & v = Plist.at(i);
-        if(v.packInfo->packType != 0) continue;
-        if(v.packInfo->boxInfoSize() < ui->comboBox->currentText().toInt()){
+    for (int i = Plist.size() - 1; i >= 0; --i) {
+        auto &v = Plist.at(i);
+        if (v.packInfo->packType != 0)
+            continue;
+        if (v.packInfo->boxInfoSize() < ui->comboBox->currentText().toInt()) {
             pInfo = v.packInfo;
             break;
         }
     }
-    if(pInfo.isNull()){
-        QMessageBox::warning(this,tr("无可接续码单"),tr("无可接续码单"));
+    if (pInfo.isNull()) {
+        QMessageBox::warning(this, tr("无可接续码单"), tr("无可接续码单"));
     }
     packinfo = pInfo;
     setProInfo(packinfo->info());
 }
 
-void FixedWeightPackForm::on_showMaoZhong_stateChanged(int )
+void FixedWeightPackForm::on_showMaoZhong_stateChanged(int)
 {
-    if(ui->showMaoZhong->isChecked()){
+    if (ui->showMaoZhong->isChecked()) {
         ui->labelWidget->setText(tr("毛重"));
     } else {
         ui->labelWidget->setText(tr("净重"));
@@ -613,37 +640,42 @@ void FixedWeightPackForm::on_pushEditBatch_clicked()
 
 void FixedWeightPackForm::EditBatch()
 {
-    if(packinfo.isNull()) return;
-    for(int i =  0; i < packinfo->boxInfoSize(); ++i){
+    if (packinfo.isNull())
+        return;
+    for (int i = 0; i < packinfo->boxInfoSize(); ++i) {
         auto box = packinfo->boxInfoAt(i);
         calcData();
-        box->box_weight = int(ui->pizhong->currentText().toDouble()*1000);
+        box->box_weight = int(ui->pizhong->currentText().toDouble() * 1000);
         box->tube_number = ui->tongshu->text().toInt();
-//        box->bucket_weight = int(floor((ui->tongzhong->currentText().toDouble()*ui->tongshu->text().toDouble()+0.005)*100)*10);
-//        if(chengZhongJingDu == 2){
-//            box->gross_weight = QString::number(gross_weight*1000).toInt();
-//            box->net_weight = QString::number(netNum*1000).toInt();
-////            qDebug()<<"boxNet"<<box->net_weight;
-////            qDebug()<<"net"<<netNum*1000;
-//        }else if(chengZhongJingDu == 1){
-//            box->gross_weight = QString::number(f_gross_weight*1000).toInt();
-//            box->net_weight = QString::number(f_netNum*1000).toInt();
-////            qDebug()<<"f_boxNet"<<box->net_weight;
-////            qDebug()<<"f_net"<<f_netNum*1000;
-//        }
-        box->bucket_weight = int(floor((ui->tongzhong->currentText().toDouble()*box->tube_number+0.005)*100)*10);
-        int net = box->gross_weight-(ui->pizhong->currentText().toDouble()+box->tube_number*ui->tongzhong->currentText().toDouble())*1000;
-        if(chengZhongJingDu==2){
+        //        box->bucket_weight = int(floor((ui->tongzhong->currentText().toDouble()*ui->tongshu->text().toDouble()+0.005)*100)*10);
+        //        if(chengZhongJingDu == 2){
+        //            box->gross_weight = QString::number(gross_weight*1000).toInt();
+        //            box->net_weight = QString::number(netNum*1000).toInt();
+        ////            qDebug()<<"boxNet"<<box->net_weight;
+        ////            qDebug()<<"net"<<netNum*1000;
+        //        }else if(chengZhongJingDu == 1){
+        //            box->gross_weight = QString::number(f_gross_weight*1000).toInt();
+        //            box->net_weight = QString::number(f_netNum*1000).toInt();
+        ////            qDebug()<<"f_boxNet"<<box->net_weight;
+        ////            qDebug()<<"f_net"<<f_netNum*1000;
+        //        }
+        box->bucket_weight = int(
+            floor((ui->tongzhong->currentText().toDouble() * box->tube_number + 0.005) * 100) * 10);
+        int net = box->gross_weight
+                  - (ui->pizhong->currentText().toDouble()
+                     + box->tube_number * ui->tongzhong->currentText().toDouble())
+                        * 1000;
+        if (chengZhongJingDu == 2) {
             box->net_weight = net;
-        }else if(chengZhongJingDu == 1){
-            box->net_weight = floor(((net/1000.00)+0.05)*10)*100;
+        } else if (chengZhongJingDu == 1) {
+            box->net_weight = floor(((net / 1000.00) + 0.05) * 10) * 100;
         }
 
         box->Level = ui->dengji->currentText();
         box->twist_type = ui->nianxiang->currentText();
         box->bucket_color = ui->guanse->currentText();
         box->sort = "1";
-//        box->remark = ui->beizhu->toPlainText();
+        //        box->remark = ui->beizhu->toPlainText();
     }
     packinfo->level = ui->dengji->currentText();
     packinfo->level_id = ui->dengji->currentData().toInt();
@@ -657,13 +689,13 @@ void FixedWeightPackForm::on_pushNoSyncList_clicked()
 
 void FixedWeightPackForm::on_pushSync_clicked()
 {
-    if(GlobalInfo::this_()->isNoLine()){
-        QMessageBox::information(this,tr("注意"),tr("离线模式不予同步"));
+    if (GlobalInfo::this_()->isNoLine()) {
+        QMessageBox::information(this, tr("注意"), tr("离线模式不予同步"));
         return;
     }
     QDate tm = QDate::currentDate();
     GlobalInfo::this_()->doSync(tm);
-    QMessageBox::information(this,tr("注意"),tr("同步成功"));
+    QMessageBox::information(this, tr("注意"), tr("同步成功"));
 }
 
 void FixedWeightPackForm::on_buding_clicked()
@@ -679,7 +711,7 @@ void FixedWeightPackForm::on_backButton_clicked()
 
 void FixedWeightPackForm::on_ruku_stateChanged(int arg1)
 {
-    if(arg1 == 2){
+    if (arg1 == 2) {
         isRuku = true;
         return;
     }
@@ -688,20 +720,25 @@ void FixedWeightPackForm::on_ruku_stateChanged(int arg1)
 
 void FixedWeightPackForm::on_useNewDataButton_clicked()
 {
-    if(packinfo.isNull()) return;
-    for(int i =  0; i < packinfo->boxInfoSize(); ++i){
+    if (packinfo.isNull())
+        return;
+    for (int i = 0; i < packinfo->boxInfoSize(); ++i) {
         QSharedPointer<BoxInfo> box = packinfo->boxInfoAt(i);
         calcData();
-        box->box_weight = int(ui->pizhong->currentText().toDouble()*1000);
+        box->box_weight = int(ui->pizhong->currentText().toDouble() * 1000);
         box->tube_number = ui->tongshu->text().toInt();
-        box->bucket_weight = int(floor((ui->tongzhong->currentText().toDouble()*box->tube_number+0.005)*100)*10);
-        int net = box->gross_weight-(ui->pizhong->currentText().toDouble()+box->tube_number*ui->tongzhong->currentText().toDouble())*1000;
-        if(chengZhongJingDu==2){
+        box->bucket_weight = int(
+            floor((ui->tongzhong->currentText().toDouble() * box->tube_number + 0.005) * 100) * 10);
+        int net = box->gross_weight
+                  - (ui->pizhong->currentText().toDouble()
+                     + box->tube_number * ui->tongzhong->currentText().toDouble())
+                        * 1000;
+        if (chengZhongJingDu == 2) {
             box->net_weight = net;
-        }else if(chengZhongJingDu == 1){
-            box->net_weight = floor(((net/1000.00)+0.05)*10)*100;
+        } else if (chengZhongJingDu == 1) {
+            box->net_weight = floor(((net / 1000.00) + 0.05) * 10) * 100;
         }
-//        qDebug()<<"单精度"<<floor(((net/1000.00)+0.05)*10)*100;
+        //        qDebug()<<"单精度"<<floor(((net/1000.00)+0.05)*10)*100;
         box->Level = ui->dengji->currentText();
         box->twist_type = ui->nianxiang->currentText();
         box->bucket_color = ui->guanse->currentText();
@@ -711,6 +748,7 @@ void FixedWeightPackForm::on_useNewDataButton_clicked()
     packinfo->level_id = ui->dengji->currentData().toInt();
     packinfo->customer = ui->taitou->text();
     packinfo->telephone = ui->taiPhone->text();
+    packinfo->address = ui->lineEdit_address->text();
     packinfo->autoRuku = ui->ruku->isChecked();
     restTableWidget();
 }

widget/fixedweightpackform.ui

@@ -415,56 +415,34 @@
         <property name="horizontalSpacing">
          <number>7</number>
         </property>
-        <item row="1" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_4">
-            <item>
-             <widget class="QLabel" name="label_8">
-              <property name="text">
-               <string>码数</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboBox">
-            <property name="minimumSize">
-             <size>
-              <width>150</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="editable">
-             <bool>true</bool>
-            </property>
-            <property name="currentText">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_7">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
+        <item row="6" column="0">
+         <widget class="QTableWidget" name="tableWidget_2">
+          <column>
+           <property name="text">
+            <string>选择</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>规格</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>类型</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>批号</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>颜色</string>
+           </property>
+          </column>
+         </widget>
         </item>
         <item row="0" column="0">
          <layout class="QGridLayout" name="gridLayout_8">
@@ -749,119 +727,6 @@ color: rgb(0, 170, 255);</string>
           </item>
          </layout>
         </item>
-        <item row="2" column="0">
-         <layout class="QHBoxLayout" name="horizontalLayout_11">
-          <item>
-           <widget class="QCheckBox" name="xiangdanPrint">
-            <property name="text">
-             <string>打印箱单</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="madanPrint">
-            <property name="text">
-             <string>打印码单</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="showMaoZhong">
-            <property name="text">
-             <string>显示毛重</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item row="5" column="0">
-         <widget class="QTableWidget" name="tableWidget_2">
-          <column>
-           <property name="text">
-            <string>选择</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>规格</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>类型</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>批号</string>
-           </property>
-          </column>
-          <column>
-           <property name="text">
-            <string>颜色</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <layout class="QGridLayout" name="gridLayout_7">
-          <item row="0" column="3">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>168</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="2">
-           <widget class="QPushButton" name="searchButton">
-            <property name="text">
-             <string>搜索</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>快速查找</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="lineEdit">
-            <property name="placeholderText">
-             <string>请输入批号</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="4">
-           <widget class="QPushButton" name="useNewDataButton">
-            <property name="text">
-             <string>应用</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
         <item row="3" column="0">
          <widget class="QWidget" name="widget_2" native="true">
           <property name="minimumSize">
@@ -1104,6 +969,155 @@ color: rgb(0, 170, 255);</string>
           </layout>
          </widget>
         </item>
+        <item row="2" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_11">
+          <item>
+           <widget class="QCheckBox" name="xiangdanPrint">
+            <property name="text">
+             <string>打印箱单</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="madanPrint">
+            <property name="text">
+             <string>打印码单</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="showMaoZhong">
+            <property name="text">
+             <string>显示毛重</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_8">
+              <property name="text">
+               <string>码数</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QComboBox" name="comboBox">
+            <property name="minimumSize">
+             <size>
+              <width>150</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_7">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </item>
+        <item row="5" column="0">
+         <layout class="QGridLayout" name="gridLayout_7">
+          <item row="0" column="3">
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>168</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="2">
+           <widget class="QPushButton" name="searchButton">
+            <property name="text">
+             <string>搜索</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="font">
+             <font>
+              <pointsize>11</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>快速查找</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="lineEdit">
+            <property name="placeholderText">
+             <string>请输入批号</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="4">
+           <widget class="QPushButton" name="useNewDataButton">
+            <property name="text">
+             <string>应用</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="4" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_3">
+          <item>
+           <widget class="QLabel" name="label_20">
+            <property name="text">
+             <string>地址</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="lineEdit_address"/>
+          </item>
+         </layout>
+        </item>
        </layout>
       </widget>
      </item>