修改标签显示错误

handle/autopackutils.cpp

@@ -20,7 +20,6 @@ void AutoPackUtils::doSend(QJsonObject json)
     if(json.isEmpty()) return;
     //保存码单，上传服务器成功后，以codeSingle为条件更改同步字段；
     this->codeSingle = json["code_single"].toString();
-//    qDebug()<<codeSingle;
 
     _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
 //    qDebug()<<QString::number(GlobalInfo::this_()->user().accountId);
@@ -47,7 +46,7 @@ void AutoPackUtils::httpResult(int emitcode, const QJsonObject body)
 void AutoPackUtils::insertDetailsSQL(QSharedPointer<BoxInfo> boxes,QString codeSingle)
 {
 //    qDebug()<<boxes->caseNumber();
-    djmb.printBoxInfo(codeSingle,boxes);
+    djmb.printBoxInfo(boxes->caseNumber(),boxes);
     detailsData.code_single = codeSingle;
     detailsData.case_number = boxes->caseNumber();
     detailsData.box_weight = boxes->box_weight;

handle/danjumuban.cpp

@@ -83,9 +83,9 @@ QImage DanJuMuBan::printBoxInfo(QString bar,QSharedPointer<BoxInfo> info)
     painter.drawText(67*5,32*5,QString("%1 kg").arg(getDecimalbit(info->net_weight / 1000.00)));//datalist.at(1));
 
     painter.drawText(67*5,39*5,QString::number(info->tube_number));//datalist.at(2));
-    painter.drawText(21*5,46*5,QString::number(pinfo->level_id));//datalist.at(3));
-    painter.drawText(67*5,46*5,pinfo->info().twist_type);//datalist.at(4));
-    painter.drawText(67*5,53*5,pinfo->info().bucket_color);//datalist.at(6));
+    painter.drawText(21*5,46*5,info->Level);//datalist.at(3));
+    painter.drawText(67*5,46*5,info->twist_type);//datalist.at(4));
+    painter.drawText(67*5,53*5,info->bucket_color);//datalist.at(6));
 
     font.setPixelSize(17);
     painter.setFont(font);
@@ -249,6 +249,7 @@ void DanJuMuBan::print(QImage image)
         /* 按照图形的比例大小重新设置视图矩形区域 */
         size.scale(rect.size(),Qt::KeepAspectRatio);
         painter.setViewport(rect.x(),rect.y(),size.width()+50,size.height());
+//        painter.setViewport(rect.x(),rect.y(),size.width(),size.height());
         painter.setWindow(image.rect());                      // 设置QPainter窗口大小为图像的大小
         painter.drawImage(0,0,image);                         // 打印图像
         painter.end();

handle/rtuport.cpp

@@ -33,8 +33,6 @@ void RtuPort::start(QString & name, int band, SerialBaseHandle * handle)
     if(!timer->isActive())
         timer->start(200);
     stard = true;
-
-
 }
 
 void RtuPort::portWrite()

handle/utils/cachefile.cpp

@@ -1,6 +1,7 @@
 #include "cachefile.h"
 
 #include <QFile>
+#include "QDebug"
 
 CacheFile::CacheFile()
 {

mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>896</width>
-    <height>579</height>
+    <height>584</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,7 +33,7 @@
     <item>
      <widget class="QStackedWidget" name="stackedWidget">
       <property name="currentIndex">
-       <number>0</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="pageMain">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -296,14 +296,14 @@ color: rgb(255, 255, 255);</string>
            <widget class="LoginForm" name="widgetLogin" native="true">
             <property name="minimumSize">
              <size>
-              <width>500</width>
-              <height>500</height>
+              <width>400</width>
+              <height>270</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>500</width>
-              <height>500</height>
+              <width>400</width>
+              <height>270</height>
              </size>
             </property>
            </widget>
@@ -353,7 +353,7 @@ color: rgb(255, 255, 255);</string>
      <x>0</x>
      <y>0</y>
      <width>896</width>
-     <height>30</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu">

packinfo.h

@@ -21,6 +21,9 @@ struct BoxInfo
     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	备注
 private:

widget/autopackform.cpp

@@ -59,9 +59,18 @@ void AutoPackForm::init()
         ui->comboBox->addItem(QString::number(i));
     }
     ui->comboBox->setCurrentText("20");
-//    on_addPackList_clicked();
+    on_addPackList_clicked();
 }
 
+//void AutoPackForm::on_tongshuguding_currentIndexChanged(const QString &arg1)
+//{
+//    if(arg1=="固定"){
+//        ui->widget_6->setEnabled(false);
+//        return;
+//    }
+//    ui->widget_6->setEnabled(true);
+//}
+
 void AutoPackForm::on_pushBack_clicked()
 {
     if(!packinfo.isNull()){
@@ -77,8 +86,6 @@ void AutoPackForm::on_pushBack_clicked()
 
 void AutoPackForm::on_addPackList_clicked()
 {
-
-
     if(!packinfo.isNull()&&packinfo->boxes().size()>0){
         //packinfo其他数据在new时已经定义好的，需要时直接调就可以了，所以这里只要箱数，等级，机台和类型
         packinfo->quantity = packinfo->boxes().size();
@@ -96,6 +103,7 @@ void AutoPackForm::on_addPackList_clicked()
 
     //发送码单 packinfo 数据, 转换为 json数据发送
     aputils.doSend(aputils.toJson(packinfo));
+    packinfo.clear();
 }
 
 void AutoPackForm::on_pushStart_clicked()
@@ -123,12 +131,7 @@ void AutoPackForm::on_addBoxList_clicked()
             QMessageBox::information(this,tr("注意"),tr("打包数据异常"));
             return;
         }
-        //当当前箱数大于等于最大箱数是启动on_addPackList_clicked();
-        if(packinfo->boxes().size()>=ui->comboBox->currentText().toInt()){
-    //        djmb.printPackInfo(packinfo->codeSingle(),packinfo);
-            on_addPackList_clicked();
-    //        qDebug()<<"这里";
-        }
+
     if(packinfo.isNull()){
         packinfo.reset(new PackInfo(_info));
         packinfo->operator_id = GlobalInfo::this_()->user().userId;
@@ -150,6 +153,9 @@ void AutoPackForm::on_addBoxList_clicked()
     box->bucket_weight = int(ui->pizhong->currentText().toInt()*ui->tongshu->text().toDouble()*1000);
     box->gross_weight = int(ui->grossWeight_2->text().toDouble()*1000);
     box->net_weight = int(ui->netWeight_2->text().toDouble()*1000);
+    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();
     packinfo->level = ui->dengji->currentText();
@@ -159,16 +165,12 @@ void AutoPackForm::on_addBoxList_clicked()
     ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,0,new QTableWidgetItem(QString::number(ui->tableWidget->rowCount())));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem((box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(QString::number(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(QString::number(box->gross_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(QString::number(box->box_weight / 1000.00)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(QString::number(box->net_weight / 1000.00)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
 
 
-//    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));
-//    qDebug()<<packinfo->boxes().size();
-//    doSend(packinfo);
-
 //    把box数据添加到packinfo的boxes数据表里；
     packinfo->addBoxInfoList(box);
 
@@ -179,10 +181,17 @@ void AutoPackForm::on_addBoxList_clicked()
     ui->labelWight->setText(getDecimalbit(packinfo->gross_weight() / 1000.00));
     ui->labelJing->setText(getDecimalbit(packinfo->net_weight() / 1000.00));
 
+    //当当前箱数大于等于最大箱数是启动on_addPackList_clicked();
+    if(packinfo->boxes().size()>=ui->comboBox->currentText().toInt()){
+        on_addPackList_clicked();
+    }
+
 }
 
 void AutoPackForm::upconfig(const DaBaoConfig &config)
 {
+
+    qDebug()<<"这里";
     // TODO：打包配置更新
     //机台
     ui->jitai->clear();
@@ -215,6 +224,12 @@ void AutoPackForm::upconfig(const DaBaoConfig &config)
     for(int i = 0;i<config.tongZhong.size();i++){
         ui->tongzhong->addItem(QString::number(config.tongZhong.at(i)));
     }
+
+    //设置选择打包界面的数据为首个；
+    ui->pizhong->setCurrentText(QString(_info.box_weight));
+    ui->guanse->setCurrentText(_info.bucket_color);
+    ui->zhixiang->setCurrentText(_info.carton_type);
+    ui->tongzhong->setCurrentText(_info.bucket_weight);
 }
 
 void AutoPackForm::upDengjiInfo(const QList<DengJiConfigItem> & dengJis)

widget/autopackform.ui

@@ -472,32 +472,26 @@ color: rgb(0, 170, 255);</string>
              <number>0</number>
             </property>
             <item>
-             <widget class="QRadioButton" name="buding">
-              <property name="minimumSize">
+             <widget class="QLabel" name="label_23">
+              <property name="maximumSize">
                <size>
-                <width>71</width>
-                <height>41</height>
+                <width>30</width>
+                <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>筒重不定</string>
+               <string>筒重</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QRadioButton" name="guding">
-              <property name="enabled">
-               <bool>true</bool>
-              </property>
-              <property name="minimumSize">
+             <widget class="QComboBox" name="comboBox_3">
+              <property name="maximumSize">
                <size>
-                <width>71</width>
-                <height>41</height>
+                <width>80</width>
+                <height>16777215</height>
                </size>
               </property>
-              <property name="text">
-               <string>筒重固定</string>
-              </property>
              </widget>
             </item>
            </layout>

widget/fixedweightpackform.cpp

@@ -116,6 +116,9 @@ void FixedWeightPackForm::on_addBoxList_clicked()
     box->bucket_weight = int(ui->pizhong->currentText().toInt()*ui->tongshu->text().toDouble()*1000);
     box->gross_weight = int(ui->grossWeight_2->text().toDouble()*1000);
     box->net_weight = int(netNum*1000);
+    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();
     packinfo->level = ui->dengji->currentText();
@@ -127,13 +130,10 @@ void FixedWeightPackForm::on_addBoxList_clicked()
 
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->box_weight / 1000.00)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->net_weight / 1000.00)));
-  ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
 
-//    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));
-//    qDebug()<<packinfo->boxes().size();
-//    doSend(packinfo);
 
 //    把box数据添加到packinfo的boxes数据表里；
     packinfo->addBoxInfoList(box);
@@ -205,6 +205,12 @@ void FixedWeightPackForm::upconfig(const DaBaoConfig &config)
     for(int i = 0;i<config.diys.size();i++){
         ui->type->addItem(QString::number(config.diys.at(i).type));
     }
+
+    //设置选择打包界面的数据为首个；
+    ui->pizhong->setCurrentText(QString(_info.box_weight));
+    ui->guanse->setCurrentText(_info.bucket_color);
+    ui->zhixiang->setCurrentText(_info.carton_type);
+    ui->tongzhong->setCurrentText(_info.bucket_weight);
 }
 void FixedWeightPackForm::upDengjiInfo(const QList<DengJiConfigItem> & dengJis)
 {

widget/fixedweightpackform.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1094</width>
-    <height>668</height>
+    <width>1115</width>
+    <height>679</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -245,7 +245,13 @@
              <widget class="QPushButton" name="pushStart">
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>136</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>999</width>
                 <height>50</height>
                </size>
               </property>
@@ -271,7 +277,13 @@ color: rgb(0, 170, 255);</string>
               </property>
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>135</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>135</width>
                 <height>50</height>
                </size>
               </property>
@@ -310,7 +322,7 @@ color: rgb(0, 170, 255);</string>
            </widget>
           </item>
           <item>
-           <widget class="QLineEdit" name="tongshu">
+           <widget class="QSpinBox" name="tongshu">
             <property name="minimumSize">
              <size>
               <width>141</width>
@@ -328,9 +340,6 @@ color: rgb(0, 170, 255);</string>
               <pointsize>20</pointsize>
              </font>
             </property>
-            <property name="text">
-             <string>0</string>
-            </property>
            </widget>
           </item>
           <item>
@@ -342,7 +351,13 @@ color: rgb(0, 170, 255);</string>
               </property>
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>136</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>136</width>
                 <height>50</height>
                </size>
               </property>
@@ -362,7 +377,13 @@ color: rgb(0, 170, 255);</string>
               </property>
               <property name="minimumSize">
                <size>
-                <width>0</width>
+                <width>136</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>136</width>
                 <height>50</height>
                </size>
               </property>

widget/loginform.cpp

@@ -50,7 +50,6 @@ void LoginForm::on_pushLogin_clicked()
     this->setEnabled(false);
 }
 
-
 void  LoginForm::clear(){
     if(_request){
         _request->deleteLater();
@@ -127,6 +126,7 @@ void LoginForm::on_pushButton_clicked()
         user.acessToken = data["access_token"].toString();
     } else {
         QMessageBox::warning(this,tr("请先成功登陆一次！"),tr("请先成功登陆一次！"));
+        return;
     }
     GlobalInfo::this_()->isNoLine = true;
     GlobalInfo::this_()->setUser(user);

widget/settingsform.cpp

@@ -39,7 +39,7 @@ void SettingsForm::Init()
     QStringList Baudlist;
     Baudlist<<"300"<<"600"<<"2400"<<"4800"<<"9600"<<"19200"<<"56000"<<"57600"<<"115200"<<"128000"<<"256000"<<"921600";
     ui->portBaudRate->addItems(Baudlist);
-    config.Start();
+
 }
 
 void SettingsForm::on_back_btn_clicked()
@@ -54,4 +54,5 @@ void SettingsForm::on_save_btn_clicked()
     config.Set("ElectronicScale","portName",ui->portName->currentText());
     config.Set("ElectronicScale","portBaudRate",ui->portBaudRate->currentText());
     config.Set("ElectronicScale","portType",ui->comboBox_2->currentIndex());
+    QMessageBox::information(this,"提示","请重新启动程序，以使用新配置！");
 }

widget/settingsform.h

@@ -4,6 +4,8 @@
 #include <QWidget>
 #include "configinfo.h"
 #include <QSerialPortInfo>
+#include "QMessageBox"
+
 
 namespace Ui {
 class SettingsForm;

widget/uncertainweightpackform.cpp

@@ -130,24 +130,23 @@ void UncertainWeightPackForm::on_addBoxList_clicked()
     box->bucket_weight = int(ui->pizhong->currentText().toInt()*ui->tongshu->text().toDouble()*1000);
     box->gross_weight = int(ui->grossWeight->text().toDouble()*1000);
     box->net_weight = int(netNum*1000);
+    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();
+
     packinfo->level = ui->dengji->currentText();
     packinfo->level_id = ui->dengji->currentData().toInt();
 
 
     ui->tableWidget->setRowCount(ui->tableWidget->rowCount()+1);
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,0,new QTableWidgetItem(QString::number(ui->tableWidget->rowCount())));
-
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,1,new QTableWidgetItem(QString::number(box->tube_number)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,2,new QTableWidgetItem(getDecimalbit(box->gross_weight / 1000.00)));
-    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->bucket_weight / 1000.00)));
+    ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,3,new QTableWidgetItem(getDecimalbit(box->box_weight / 1000.00)));
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,4,new QTableWidgetItem(getDecimalbit(box->net_weight/1000.00)));
-
     ui->tableWidget->setItem(ui->tableWidget->rowCount()-1,5,new QTableWidgetItem(box->caseNumber()));
-//    emit djmbbox(djmb.printBoxInfo(box->caseNumber(),box));
-//    qDebug()<<packinfo->boxes().size();
-//    doSend(packinfo);
 
 //    把box数据添加到packinfo的boxes数据表里；
     packinfo->addBoxInfoList(box);
@@ -162,7 +161,6 @@ void UncertainWeightPackForm::on_addBoxList_clicked()
     //当当前箱数大于等于最大箱数是启动on_addPackList_clicked();
     if(packinfo->boxes().size()>=ui->mashu->currentText().toInt()){
         on_addPackList_clicked();
-
     }
 }
 
@@ -258,6 +256,12 @@ void UncertainWeightPackForm::upconfig(const DaBaoConfig &config)
 
     tubeNumMin = config.buDingZhongTongShuFanWei.first;
     tubeNumMax = config.buDingZhongTongShuFanWei.second;
+
+    //设置选择打包界面的数据为首个；
+    ui->pizhong->setCurrentText(QString(_info.box_weight));
+    ui->guanse->setCurrentText(_info.bucket_color);
+    ui->zhixiang->setCurrentText(_info.carton_type);
+    ui->tongzhong->setCurrentText(_info.bucket_weight);
 }
 void UncertainWeightPackForm::upDengjiInfo(const QList<DengJiConfigItem> & dengJis)
 {

widget/uncertainweightpackform.h

@@ -9,6 +9,7 @@
 #include "handle/database.h"
 #include "handle/autopackutils.h"
 #include "QTimer"
+#include "handle/danjumuban.h"
 
 namespace Ui {
 class UncertainWeightPackForm;
@@ -58,6 +59,7 @@ private:
     RemotePackConfig packConfig;
     HttpRequest _request;
     AutoPackUtils aputils;
+    DanJuMuBan djmb;
     bool autoRead;
 
 

widget/uncertainweightpackform.ui

@@ -416,7 +416,7 @@ color: rgb(0, 170, 255);</string>
                </size>
               </property>
               <property name="text">
-               <string>筒数</string>
+               <string>筒重</string>
               </property>
              </widget>
             </item>