修改页面及功能

JxcClient.pro

@@ -28,12 +28,14 @@ SOURCES += \
     handle//seriport/logserialport.cpp \
     handle/remotepackconfig.cpp \
     handle/rtuport.cpp \
+    handle/selectspecs.cpp \
     handle/seriport/assictscalet2000.cpp \
     handle/seriport/serialbasehandle.cpp \
     handle/utils/cachefile.cpp \
     handle/utils/rtuhelper.cpp \
     handle/utils/utilsfunc.cpp \
     packinfo.cpp \
+    widget/addnewspecsform.cpp \
     widget/autopackform.cpp \
     widget/fixedweightpackform.cpp \
     widget/loginform.cpp \
@@ -52,6 +54,7 @@ HEADERS += \
     handle/danjumuban.h \
     handle/database.h \
     handle/httprequest.h \
+    handle/selectspecs.h \
     handle/seriport/logserialport.h \
     handle/remotepackconfig.h \
     handle/rtuport.h \
@@ -61,6 +64,7 @@ HEADERS += \
     handle/utils/rtuhelper.h \
     handle/utils/utilsfunc.h \
     packinfo.h \
+    widget/addnewspecsform.h \
     widget/autopackform.h \
     widget/fixedweightpackform.h \
     widget/loginform.h \
@@ -71,6 +75,7 @@ HEADERS += \
     widget/uncertainweightpackform.h
 
 FORMS += \
+    widget/addnewspecsform.ui \
     widget/autopackform.ui \
     widget/fixedweightpackform.ui \
     widget/loginform.ui \
@@ -84,3 +89,6 @@ FORMS += \
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
+
+RESOURCES += \
+    images.qrc

handle/danjumuban.cpp

@@ -167,7 +167,7 @@ QImage DanJuMuBan::printPackInfo(QString bar, QSharedPointer<PackInfo> info)
     painter.drawText(19*5,15*5,info->info().specs);//QStringLiteral("规格"));
     painter.drawText(70*5,15*5,info->info().category);//QStringLiteral("类型"));
     painter.drawText(19*5,21*5,info->info().batch_no);//QStringLiteral("批号"));
-    painter.drawText(70*5,21*5,QString::number(info->level_id));//info.at(0));
+    painter.drawText(70*5,21*5,info->level);//info.at(0));
     for(int i = 0; i < boxSize; ++i)
     {
         QString code = getDecimalbit(info->boxes().at(i)->net_weight / 1000);

handle/remotepackconfig.cpp

@@ -119,7 +119,6 @@ void RemotePackConfig::refConfig()
 
 void RemotePackConfig::result(int code, const QJsonObject & body)
 {
-//    qDebug()<<body;
     int ecode = body.value("code").toInt(404);
     if(ecode != 200){
         emit configUpdateError(ecode,body.value("message").toString(""));

handle/selectspecs.cpp

@@ -0,0 +1,68 @@
+#include "selectspecs.h"
+#include "qjsonarray.h"
+
+SelectSpecs::SelectSpecs()
+{
+    connect(&_request,&HttpRequest::result,this,&SelectSpecs::result);
+}
+
+void SelectSpecs::getInfo(int page, int pageListNum)
+{
+    auto glo = GlobalInfo::this_();
+     auto url = glo->config().baseUrl + QString("/v1/goods/list?page=%1&limit=%2").arg(page).arg(pageListNum);
+     _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
+     _request.get(url);
+}
+
+void SelectSpecs::result(int code, const QJsonObject & body)
+{
+    if(body.value("code").toInt(404) != 200){
+
+        totleNum = 0;
+        return;
+    }
+    currtInfo.clear();
+    totleNum = body.value("total").toInt();
+    QJsonArray ary = body.value("data").toArray();
+    for(int i =0; i < ary.size(); ++i){
+        parseObject(ary.at(i).toObject());
+    }
+    emit change();
+}
+
+
+void SelectSpecs::parseObject(const QJsonObject & obj)
+{
+    ProjectInfo info;
+    info.dtex = obj.value("detx").toString();
+
+    info.goods_id = obj.value("goods_id").toInt();
+    info.batch_no = obj.value("batch_no").toString();
+    info.category = obj.value("category").toString();
+    info.product_type_code = obj.value("product_type_code").toString();
+    info.spec_role = obj.value("spec_role").toString();
+    info.denier = obj.value("denier").toString();
+//    info.dtex = obj.value("detx").toString();
+    info.fiber = obj.value("fiber").toString();
+    info.specs = obj.value("specs").toString();
+    info.color = obj.value("color").toString();
+    info.twist_type = obj.value("twist_type").toString();
+    info.bucket_color = obj.value("bucket_color").toString();
+    info.box_weight = obj.value("box_weight").toString();
+    info.bucket_weight = obj.value("bucket_weight").toString();
+    info.machine_no = obj.value("machine_no").toString();
+    info.carton_type = obj.value("carton_type").toString();
+    info.limit_number = obj.value("limit_number").toString();
+    info.bucket_number = obj.value("bucket_number").toString();
+    info.cake_float = obj.value("cake_float").toString();
+    info.box_float = obj.value("box_float").toString();
+    info.box_rule = obj.value("box_rule").toString();
+    info.customer = obj.value("customer").toString();
+    info.remark = obj.value("remark").toString();
+    info.is_disable  = obj.value("is_disable").toBool();
+    info.create_time = obj.value("create_time").toInt();
+    info.modified_time = obj.value("modified_time").toInt();
+
+    currtInfo.append(info);
+
+}

handle/selectspecs.h

@@ -0,0 +1,31 @@
+#ifndef SELECTSPECS_H
+#define SELECTSPECS_H
+
+#include <QObject>
+#include "configinfo.h"
+#include "httprequest.h"
+#include "globalinfo.h"
+
+class SelectSpecs : public QObject
+{
+    Q_OBJECT
+public:
+    SelectSpecs();
+
+    void getInfo(int page, int pageListNum);
+    void result(int code, const QJsonObject & body);
+    void parseObject(const QJsonObject & obj);
+
+    QList<ProjectInfo>  currtInfo;
+
+signals:
+    void change();
+
+public:
+    int totleNum;
+
+private:
+    HttpRequest _request;
+};
+
+#endif // SELECTSPECS_H

images.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/backImage.jpg</file>
+    </qresource>
+</RCC>

mainwindow.cpp

@@ -9,7 +9,7 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     connect(ui->widgetLogin,&LoginForm::loginFinish,this,&MainWindow::backMenu);
     connect(ui->pageSelectValue,&SelectValueForm::back,this,&MainWindow::backMenu);
-    connect(ui->pageAutoPack,&AutoPackForm::back,this,&MainWindow::backMenu);
+//    connect(ui->pageAutoPack,&AutoPackForm::back,this,&MainWindow::backMenu);
     connect(ui->pagePackDetail,&PackDetailForm::back,this,&MainWindow::backMenu);
     connect(ui->pageSettings,&SettingsForm::back,this,&MainWindow::backMenu);
     connect(ui->pageDingZhong,&FixedWeightPackForm::back,this,&MainWindow::backMenu);
@@ -17,13 +17,15 @@ MainWindow::MainWindow(QWidget *parent)
 
     connect(ui->pageSelectValue,&SelectValueForm::selectProject,this,&MainWindow::pageStatusChange);
     ui->stackedWidget->setCurrentWidget(ui->pageLogin);
-    connect(ui->pageAutoPack,&AutoPackForm::djmbbox,this,&MainWindow::changedjmb);
+//    connect(ui->pageAutoPack,&AutoPackForm::djmbbox,this,&MainWindow::changedjmb);
     connect(ui->widgetLogin,&LoginForm::SettingsClicked,this,&MainWindow::changeToSettings);
-    connect(ui->actionQuanping,&QAction::trigger,[this](){this->showFullScreen();});
+//    connect(ui->actionQuanping,&QAction::trigger,[this](){this->showFullScreen();});
     connect(ui->actionMax,&QAction::trigger,[this](){this->showMaximized();});
     database.openDB();
     database.createDetailsDatabase();
     database.createProductDatabase();
+    ui->checkBox->hide();
+    ui->dingzhongButton->setChecked(true);
 }
 
 MainWindow::~MainWindow()
@@ -67,8 +69,8 @@ void MainWindow::pageStatusChange(const ProjectInfo & info, int status)
     switch (status) {
     case 1:
         ui->stackedWidget->setCurrentWidget(ui->pageAutoPack);
-        ui->pageAutoPack->setProInfo(info);
-        ui->pageAutoPack->init();
+//        ui->pageAutoPack->setProInfo(info);
+//        ui->pageAutoPack->init();
         break;
     case 2:
         ui->stackedWidget->setCurrentWidget(ui->pageDingZhong);
@@ -92,18 +94,19 @@ void MainWindow::changeToSettings()
 void MainWindow::backMenu()
 {
     int user = GlobalInfo::this_()->user().userId;
-
     if(user==0){
         ui->stackedWidget->setCurrentWidget(ui->pageLogin);
         return;
     }
-    ui->stackedWidget->setCurrentWidget(ui->pageMain);
+//    ui->stackedWidget->setCurrentWidget(ui->pageMain);
+    ui->stackedWidget->setCurrentWidget(ui->pageAutoPack);
     if(!rtuport.isStart()){
         auto go = GlobalInfo::this_();
         ConfigInfo info;
         info.Start();
         auto handle = SerialBaseHandle::getHandler(info.portType,"");
         rtuport.start(info.portName,info.portBaudRate.toInt(),handle);
+        on_dingzhongButton_clicked();
     }
 }
 
@@ -113,3 +116,14 @@ void MainWindow::changedjmb(QImage image)
     ui->djmb->setPixmap(QPixmap::fromImage(image));
 }
 
+void MainWindow::on_dingzhongButton_clicked()
+{
+    ui->stackedWidget_2->setCurrentWidget(ui->dingzhong);
+    ui->dingzhong->init();
+}
+
+void MainWindow::on_budingButton_clicked()
+{
+    ui->stackedWidget_2->setCurrentWidget(ui->buding);
+    ui->buding->init();
+}

mainwindow.h

@@ -29,6 +29,10 @@ private slots:
 
     void on_pushBuDingZhong_clicked();
 
+    void on_dingzhongButton_clicked();
+
+    void on_budingButton_clicked();
+
 private:
     void backMenu();
     void pageStatusChange(const ProjectInfo & info, int status);

mainwindow.ui

@@ -6,34 +6,19 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>896</width>
-    <height>584</height>
+    <width>1033</width>
+    <height>668</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <property name="spacing">
-     <number>0</number>
-    </property>
-    <property name="leftMargin">
-     <number>0</number>
-    </property>
-    <property name="topMargin">
-     <number>0</number>
-    </property>
-    <property name="rightMargin">
-     <number>0</number>
-    </property>
-    <property name="bottomMargin">
-     <number>0</number>
-    </property>
-    <item>
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0">
      <widget class="QStackedWidget" name="stackedWidget">
       <property name="currentIndex">
-       <number>3</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="pageMain">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -306,6 +291,9 @@ color: rgb(255, 255, 255);</string>
               <height>270</height>
              </size>
             </property>
+            <property name="styleSheet">
+             <string notr="true">background-color: rgb(185, 229, 255);</string>
+            </property>
            </widget>
           </item>
           <item>
@@ -338,7 +326,90 @@ color: rgb(255, 255, 255);</string>
         </item>
        </layout>
       </widget>
-      <widget class="AutoPackForm" name="pageAutoPack"/>
+      <widget class="QWidget" name="pageAutoPack">
+       <layout class="QGridLayout" name="gridLayout_3">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
+         <number>0</number>
+        </property>
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QWidget" name="widget_2" native="true">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>40</height>
+           </size>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_6">
+           <item row="0" column="3">
+            <widget class="QCheckBox" name="checkBox">
+             <property name="text">
+              <string>打包是否入库</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QRadioButton" name="dingzhongButton">
+             <property name="text">
+              <string>定重打包</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="4">
+            <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>311</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="0" column="2">
+            <widget class="QRadioButton" name="budingButton">
+             <property name="text">
+              <string>不定重打包</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <spacer name="horizontalSpacer_4">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>338</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QStackedWidget" name="stackedWidget_2">
+          <widget class="FixedWeightPackForm" name="dingzhong"/>
+          <widget class="UncertainWeightPackForm" name="buding"/>
+         </widget>
+        </item>
+       </layout>
+      </widget>
       <widget class="SelectValueForm" name="pageSelectValue"/>
       <widget class="PackDetailForm" name="pagePackDetail"/>
       <widget class="FixedWeightPackForm" name="pageDingZhong"/>
@@ -352,28 +423,76 @@ color: rgb(255, 255, 255);</string>
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>896</width>
+     <width>1033</width>
      <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu">
     <property name="title">
-     <string>显示</string>
+     <string>设置</string>
     </property>
-    <addaction name="actionQuanping"/>
+    <widget class="QMenu" name="menu_4">
+     <property name="title">
+      <string>规格设置</string>
+     </property>
+     <addaction name="action_2"/>
+     <addaction name="action_3"/>
+     <addaction name="action_4"/>
+    </widget>
+    <addaction name="menu_4"/>
     <addaction name="actionMax"/>
+    <addaction name="action"/>
+   </widget>
+   <widget class="QMenu" name="menu_2">
+    <property name="title">
+     <string>入库</string>
+    </property>
+    <addaction name="action_5"/>
+    <addaction name="action_6"/>
+   </widget>
+   <widget class="QMenu" name="menu_3">
+    <property name="title">
+     <string>统计</string>
+    </property>
    </widget>
    <addaction name="menu"/>
+   <addaction name="menu_2"/>
+   <addaction name="menu_3"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionQuanping">
+  <action name="actionMax">
    <property name="text">
-    <string>全屏</string>
+    <string>连接设置</string>
    </property>
   </action>
-  <action name="actionMax">
+  <action name="action">
+   <property name="text">
+    <string>退出账号</string>
+   </property>
+  </action>
+  <action name="action_2">
+   <property name="text">
+    <string>新建规格</string>
+   </property>
+  </action>
+  <action name="action_3">
+   <property name="text">
+    <string>查看规格</string>
+   </property>
+  </action>
+  <action name="action_4">
+   <property name="text">
+    <string>修改规格</string>
+   </property>
+  </action>
+  <action name="action_5">
    <property name="text">
-    <string>最大化</string>
+    <string>打包</string>
+   </property>
+  </action>
+  <action name="action_6">
+   <property name="text">
+    <string>修改</string>
    </property>
   </action>
  </widget>
@@ -384,12 +503,6 @@ color: rgb(255, 255, 255);</string>
    <header>widget/loginform.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>AutoPackForm</class>
-   <extends>QWidget</extends>
-   <header>widget/autopackform.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>SelectValueForm</class>
    <extends>QWidget</extends>

widget/addnewspecsform.cpp

@@ -0,0 +1,14 @@
+#include "addnewspecsform.h"
+#include "ui_addnewspecsform.h"
+
+AddNewSpecsForm::AddNewSpecsForm(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::AddNewSpecsForm)
+{
+    ui->setupUi(this);
+}
+
+AddNewSpecsForm::~AddNewSpecsForm()
+{
+    delete ui;
+}

widget/addnewspecsform.h

@@ -0,0 +1,22 @@
+#ifndef ADDNEWSPECSFORM_H
+#define ADDNEWSPECSFORM_H
+
+#include <QWidget>
+
+namespace Ui {
+class AddNewSpecsForm;
+}
+
+class AddNewSpecsForm : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AddNewSpecsForm(QWidget *parent = nullptr);
+    ~AddNewSpecsForm();
+
+private:
+    Ui::AddNewSpecsForm *ui;
+};
+
+#endif // ADDNEWSPECSFORM_H

widget/addnewspecsform.ui

@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AddNewSpecsForm</class>
+ <widget class="QWidget" name="AddNewSpecsForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>764</width>
+    <height>703</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_10">
+   <item row="0" column="0" colspan="2">
+    <widget class="QWidget" name="widget_5" native="true">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>52</height>
+      </size>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_8">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="font">
+           <font>
+            <pointsize>14</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>新建信息</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>628</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="backButton">
+          <property name="text">
+           <string>退出</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="widget_4" native="true">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>45</height>
+      </size>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_7">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>批号</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="lineEdit"/>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>568</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QWidget" name="widget_2" native="true">
+     <layout class="QGridLayout" name="gridLayout_5">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout">
+        <property name="horizontalSpacing">
+         <number>43</number>
+        </property>
+        <property name="verticalSpacing">
+         <number>14</number>
+        </property>
+        <item row="0" column="5">
+         <widget class="QLineEdit" name="lineEdit_14"/>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_5">
+          <property name="text">
+           <string>颜    色</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="4">
+         <widget class="QLabel" name="label_20">
+          <property name="text">
+           <string>类    型</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="QLabel" name="label_8">
+          <property name="text">
+           <string>箱单抬头</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="4">
+         <widget class="QLabel" name="label_24">
+          <property name="text">
+           <string>时    间</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="lineEdit_3"/>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="lineEdit_2"/>
+        </item>
+        <item row="3" column="4">
+         <widget class="QLabel" name="label_22">
+          <property name="text">
+           <string>机    台</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <widget class="QLabel" name="label_14">
+          <property name="text">
+           <string>规格录入</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="5">
+         <widget class="QComboBox" name="comboBox_9"/>
+        </item>
+        <item row="5" column="1">
+         <widget class="QLineEdit" name="lineEdit_4"/>
+        </item>
+        <item row="1" column="2">
+         <widget class="QLabel" name="label_15">
+          <property name="text">
+           <string>孔数(F)</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3">
+         <widget class="QComboBox" name="comboBox_5"/>
+        </item>
+        <item row="2" column="5">
+         <widget class="QComboBox" name="comboBox_7"/>
+        </item>
+        <item row="0" column="1">
+         <widget class="QComboBox" name="comboBox"/>
+        </item>
+        <item row="3" column="5">
+         <widget class="QComboBox" name="comboBox_8"/>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label_7">
+          <property name="text">
+           <string>纸    箱</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>分特(dt)</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QLabel" name="label_16">
+          <property name="text">
+           <string>捻    向</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>品    种</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="2">
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>筒    数</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="3">
+         <widget class="QLineEdit" name="lineEdit_13"/>
+        </item>
+        <item row="1" column="5">
+         <widget class="QLineEdit" name="lineEdit_15"/>
+        </item>
+        <item row="2" column="4">
+         <widget class="QLabel" name="label_21">
+          <property name="text">
+           <string>管    色</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="3">
+         <widget class="QComboBox" name="comboBox_6"/>
+        </item>
+        <item row="4" column="1">
+         <widget class="QComboBox" name="comboBox_3"/>
+        </item>
+        <item row="4" column="4">
+         <widget class="QLabel" name="label_23">
+          <property name="text">
+           <string>箱号规格</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="5">
+         <widget class="QComboBox" name="comboBox_10"/>
+        </item>
+        <item row="3" column="1">
+         <widget class="QComboBox" name="comboBox_2"/>
+        </item>
+        <item row="1" column="3">
+         <widget class="QLineEdit" name="lineEdit_12"/>
+        </item>
+        <item row="0" column="3">
+         <widget class="QComboBox" name="comboBox_4"/>
+        </item>
+        <item row="0" column="4">
+         <widget class="QLabel" name="label_19">
+          <property name="text">
+           <string>旦数(D)</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>箱    重</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2">
+         <widget class="QLabel" name="label_17">
+          <property name="text">
+           <string>筒    重</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QWidget" name="widget_3" native="true">
+     <layout class="QGridLayout" name="gridLayout_6">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>别    名</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="lineEdit_5"/>
+        </item>
+        <item row="0" column="2">
+         <widget class="QLineEdit" name="lineEdit_6"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_10">
+          <property name="text">
+           <string>别    名</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="lineEdit_7"/>
+        </item>
+        <item row="1" column="2">
+         <widget class="QLineEdit" name="lineEdit_8"/>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_11">
+          <property name="text">
+           <string>别    名</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="lineEdit_9"/>
+        </item>
+        <item row="2" column="2">
+         <widget class="QLineEdit" name="lineEdit_10"/>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>364</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0">
+    <widget class="QWidget" name="widget" native="true">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>101</height>
+      </size>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_12">
+          <property name="text">
+           <string>箱单选择</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="lineEdit_11"/>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_13">
+          <property name="text">
+           <string>备    注</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QTextEdit" name="textEdit">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>51</height>
+           </size>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <spacer name="horizontalSpacer_5">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>364</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QWidget" name="widget_6" native="true">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>52</height>
+      </size>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_9">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>598</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pushButton">
+          <property name="text">
+           <string>取消</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pushButton_2">
+          <property name="text">
+           <string>确定</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

widget/fixedweightpackform.cpp

@@ -12,6 +12,7 @@ FixedWeightPackForm::FixedWeightPackForm(QWidget *parent) :
     timer->start(500);
     connect(&packConfig,&RemotePackConfig::configUpdate,this,&FixedWeightPackForm::upconfig);
     connect(&packConfig,&RemotePackConfig::dengJIConfigUp,this,&FixedWeightPackForm::upDengjiInfo);
+    connect(&specs,&SelectSpecs::change,this,&FixedWeightPackForm::changeSpecs);
     CacheFile f;
     auto dt = f.readFile("dingzhongInfo.cache");
     auto list = QString::fromUtf8(dt).split("[,]");
@@ -19,6 +20,8 @@ FixedWeightPackForm::FixedWeightPackForm(QWidget *parent) :
         ui->taitou->setText(list.at(0));
         ui->taiPhone->setText(list.at(1));
     }
+    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    ui->pushStart->hide();
 }
 
 FixedWeightPackForm::~FixedWeightPackForm()
@@ -120,7 +123,7 @@ void FixedWeightPackForm::on_addBoxList_clicked()
     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();
 
@@ -163,6 +166,7 @@ void FixedWeightPackForm::init()
         ui->comboBox->addItem(QString::number(i));
     }
     ui->comboBox->setCurrentText("20");
+    specs.getInfo(0,20);
 //    on_addPackList_clicked();
 }
 
@@ -201,11 +205,6 @@ void FixedWeightPackForm::upconfig(const DaBaoConfig &config)
         ui->tongzhong->addItem(QString::number(config.tongZhong.at(i)));
     }
 
-    ui->type->clear();
-    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);
@@ -232,3 +231,31 @@ void FixedWeightPackForm::on_pushPiLiang_clicked()
         on_addBoxList_clicked();
     }
 }
+
+//获取品目信息
+void FixedWeightPackForm::on_searchButton_clicked()
+{
+    specs.getInfo(0,20);
+}
+
+void FixedWeightPackForm::changeSpecs()
+{
+    ui->tableWidget_2->clearContents();
+    ui->tableWidget_2->setRowCount(0);
+    for(int i = 0; i < specs.currtInfo.size(); ++i){
+        auto & v = specs.currtInfo.at(i);
+        ui->tableWidget_2->insertRow(i);
+        auto xuanze_btn =  new QRadioButton();
+        connect(xuanze_btn,&QPushButton::clicked,[i,this](){this->xuanze_clicked(i);});
+        ui->tableWidget_2->setCellWidget(i,0,xuanze_btn);
+        ui->tableWidget_2->setItem(i,1,new QTableWidgetItem(v.specs));
+        ui->tableWidget_2->setItem(i,2,new QTableWidgetItem(v.category));
+        ui->tableWidget_2->setItem(i,3,new QTableWidgetItem(v.batch_no));
+        ui->tableWidget_2->setItem(i,4,new QTableWidgetItem(v.color));
+    }
+}
+
+void FixedWeightPackForm::xuanze_clicked(int row)
+{
+
+}

widget/fixedweightpackform.h

@@ -9,6 +9,7 @@
 #include "handle/database.h"
 #include "handle/autopackutils.h"
 #include "QTimer"
+#include "handle/selectspecs.h"
 
 namespace Ui {
 class FixedWeightPackForm;
@@ -37,10 +38,14 @@ private slots:
 
     void on_pushPiLiang_clicked();
 
+    void on_searchButton_clicked();
+
 public slots:
     void upconfig(const DaBaoConfig & config);
     void upDengjiInfo(const QList<DengJiConfigItem> & dengJis);
     void init();
+    void changeSpecs();
+    void xuanze_clicked(int row);
 
 signals:
     void back();
@@ -55,6 +60,7 @@ private:
     DanJuMuBan djmb;
     double netNum = 0.00;
     AutoPackUtils aputils;
+    SelectSpecs specs;
 };
 
 #endif // FIXEDWEIGHTPACKFORM_H

widget/fixedweightpackform.ui

@@ -6,131 +6,121 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1115</width>
-    <height>679</height>
+    <width>1160</width>
+    <height>704</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_16">
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_9">
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="pushBack">
-        <property name="text">
-         <string>&lt;返回主页</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>452</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_20">
-        <property name="text">
-         <string>定重打包</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>451</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QWidget" name="widget_4" native="true">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>合计</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>筒数：</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="labelTongZHong">
-            <property name="text">
-             <string>0</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>毛重：</string>
-            </property>
-           </widget>
+       <layout class="QGridLayout" name="gridLayout_4">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>合计</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>筒数：</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelTongZHong">
+              <property name="text">
+               <string>0</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>毛重：</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelWight">
+              <property name="text">
+               <string>0</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>净重：</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelJing">
+              <property name="text">
+               <string>0</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
-          <item>
-           <widget class="QLabel" name="labelWight">
-            <property name="text">
-             <string>0</string>
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>净重：</string>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>18</width>
+              <height>20</height>
+             </size>
             </property>
-           </widget>
+           </spacer>
           </item>
-          <item>
-           <widget class="QLabel" name="labelJing">
-            <property name="text">
-             <string>0</string>
-            </property>
-           </widget>
+          <item row="0" column="2">
+           <layout class="QGridLayout" name="gridLayout_2">
+            <item row="0" column="0">
+             <widget class="QPushButton" name="pushButton">
+              <property name="text">
+               <string>未同步列表</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QPushButton" name="pushButton_2">
+              <property name="text">
+               <string>同步</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="2">
+             <widget class="QPushButton" name="pushButton_3">
+              <property name="text">
+               <string>接续</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </item>
          </layout>
         </item>
-        <item>
+        <item row="1" column="0">
          <widget class="QTableWidget" name="tableWidget">
           <property name="minimumSize">
            <size>
@@ -193,14 +183,20 @@
          <height>16777215</height>
         </size>
        </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_4">
-          <item>
+       <layout class="QGridLayout" name="gridLayout_10">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout_9">
+          <item row="0" column="0">
            <widget class="QLabel" name="label_23">
             <property name="minimumSize">
              <size>
-              <width>41</width>
+              <width>31</width>
               <height>16</height>
              </size>
             </property>
@@ -215,11 +211,11 @@
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="1">
            <widget class="QLineEdit" name="grossWeight_2">
             <property name="minimumSize">
              <size>
-              <width>141</width>
+              <width>120</width>
               <height>61</height>
              </size>
             </property>
@@ -239,70 +235,7 @@
             </property>
            </widget>
           </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <widget class="QPushButton" name="pushStart">
-              <property name="minimumSize">
-               <size>
-                <width>136</width>
-                <height>50</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>999</width>
-                <height>50</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">background-color: rgb(255, 255, 255);
-color: rgb(0, 170, 255);</string>
-              </property>
-              <property name="text">
-               <string>开始打包</string>
-              </property>
-              <property name="checkable">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="pushPiLiang">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>135</width>
-                <height>50</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>135</width>
-                <height>50</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">background-color: rgb(255, 255, 255);
-color: rgb(0, 170, 255);</string>
-              </property>
-              <property name="text">
-               <string>批量添加</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <item>
+          <item row="0" column="2">
            <widget class="QLabel" name="label_24">
             <property name="minimumSize">
              <size>
@@ -321,11 +254,11 @@ color: rgb(0, 170, 255);</string>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="3">
            <widget class="QSpinBox" name="tongshu">
             <property name="minimumSize">
              <size>
-              <width>141</width>
+              <width>120</width>
               <height>61</height>
              </size>
             </property>
@@ -342,7 +275,28 @@ color: rgb(0, 170, 255);</string>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="4">
+           <widget class="QLabel" name="label_6">
+            <property name="text">
+             <string>箱数</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="5">
+           <widget class="QSpinBox" name="spinBox">
+            <property name="minimumSize">
+             <size>
+              <width>120</width>
+              <height>61</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item row="1" column="0">
+         <layout class="QGridLayout" name="gridLayout_8">
+          <item row="0" column="0">
            <layout class="QHBoxLayout" name="horizontalLayout_8">
             <item>
              <widget class="QPushButton" name="addBoxList">
@@ -398,24 +352,69 @@ color: rgb(0, 170, 255);</string>
             </item>
            </layout>
           </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
-             <widget class="QLabel" name="label_25">
+             <widget class="QPushButton" name="pushStart">
+              <property name="minimumSize">
+               <size>
+                <width>136</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>999</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 170, 255);</string>
+              </property>
               <property name="text">
-               <string>包装类型</string>
+               <string>开始打包</string>
+              </property>
+              <property name="checkable">
+               <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="type"/>
+             <widget class="QPushButton" name="pushPiLiang">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>135</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>135</width>
+                <height>50</height>
+               </size>
+              </property>
+              <property name="styleSheet">
+               <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 170, 255);</string>
+              </property>
+              <property name="text">
+               <string>批量添加</string>
+              </property>
+             </widget>
             </item>
            </layout>
           </item>
+         </layout>
+        </item>
+        <item row="2" column="0">
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_4">
             <item>
@@ -427,6 +426,12 @@ color: rgb(0, 170, 255);</string>
             </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>
@@ -442,126 +447,135 @@ color: rgb(0, 170, 255);</string>
             <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>
+        <item row="3" column="0">
          <widget class="QWidget" name="widget_2" native="true">
           <property name="minimumSize">
            <size>
-            <width>450</width>
-            <height>402</height>
+            <width>471</width>
+            <height>241</height>
            </size>
           </property>
-          <layout class="QGridLayout" name="gridLayout">
+          <layout class="QGridLayout" name="gridLayout_6">
            <property name="leftMargin">
             <number>0</number>
            </property>
            <property name="rightMargin">
             <number>0</number>
            </property>
-           <item row="3" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_12">
+           <item row="1" column="0" colspan="2">
+            <layout class="QHBoxLayout" name="horizontalLayout_13">
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_13">
-               <item>
-                <widget class="QLabel" name="label_16">
-                 <property name="text">
-                  <string>码单</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="madan">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                </widget>
-               </item>
+              <layout class="QVBoxLayout" name="verticalLayout_5">
                <item>
-                <widget class="QLabel" name="label_17">
+                <widget class="QLabel" name="label_9">
                  <property name="text">
-                  <string>箱单</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="xiangdan">
-                 <property name="enabled">
-                  <bool>false</bool>
+                  <string>打包班次</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <spacer name="verticalSpacer">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>40</height>
-                  </size>
-                 </property>
-                </spacer>
+                <widget class="QComboBox" name="comboBox_2"/>
                </item>
               </layout>
              </item>
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_14">
+              <layout class="QVBoxLayout" name="verticalLayout_6">
                <item>
-                <widget class="QLabel" name="label_18">
+                <widget class="QLabel" name="label_10">
                  <property name="text">
-                  <string>箱单抬头</string>
+                  <string>机台</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QLineEdit" name="taitou"/>
+                <widget class="QComboBox" name="jitai"/>
                </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QVBoxLayout" name="verticalLayout_7">
                <item>
-                <widget class="QLabel" name="label_22">
+                <widget class="QLabel" name="label_11">
                  <property name="text">
-                  <string>电话</string>
+                  <string>等级</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QLineEdit" name="taiPhone"/>
-               </item>
-               <item>
-                <spacer name="verticalSpacer_2">
-                 <property name="orientation">
-                  <enum>Qt::Vertical</enum>
-                 </property>
-                 <property name="sizeHint" stdset="0">
-                  <size>
-                   <width>20</width>
-                   <height>40</height>
-                  </size>
-                 </property>
-                </spacer>
+                <widget class="QComboBox" name="dengji"/>
                </item>
               </layout>
              </item>
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_15">
+              <layout class="QVBoxLayout" name="verticalLayout_8">
                <item>
-                <widget class="QLabel" name="label_19">
+                <widget class="QLabel" name="label_12">
                  <property name="text">
-                  <string>备注</string>
+                  <string>皮重</string>
                  </property>
                 </widget>
                </item>
                <item>
-                <widget class="QTextEdit" name="beizhu"/>
+                <widget class="QComboBox" name="pizhong"/>
                </item>
               </layout>
              </item>
             </layout>
            </item>
-           <item row="0" column="0">
+           <item row="3" column="0">
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_17">
+               <property name="text">
+                <string>箱单</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QComboBox" name="xiangdan">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="3" column="1">
+            <layout class="QGridLayout" name="gridLayout_5">
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_16">
+               <property name="text">
+                <string>码单</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QComboBox" name="madan">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="0" column="0" colspan="2">
             <layout class="QHBoxLayout" name="horizontalLayout_11">
              <item>
               <widget class="QCheckBox" name="xiangdanPrint">
@@ -595,7 +609,7 @@ color: rgb(0, 170, 255);</string>
              </item>
             </layout>
            </item>
-           <item row="2" column="0">
+           <item row="2" column="0" colspan="2">
             <layout class="QHBoxLayout" name="horizontalLayout_14">
              <item>
               <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -655,69 +669,105 @@ color: rgb(0, 170, 255);</string>
              </item>
             </layout>
            </item>
-           <item row="1" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_13">
+           <item row="4" column="0" colspan="2">
+            <layout class="QHBoxLayout" name="horizontalLayout_9">
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_5">
-               <item>
-                <widget class="QLabel" name="label_9">
-                 <property name="text">
-                  <string>打包班次</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="comboBox_2"/>
-               </item>
-              </layout>
+              <widget class="QLabel" name="label_18">
+               <property name="text">
+                <string>箱单抬头</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_6">
-               <item>
-                <widget class="QLabel" name="label_10">
-                 <property name="text">
-                  <string>机台</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="jitai"/>
-               </item>
-              </layout>
+              <widget class="QLineEdit" name="taitou"/>
              </item>
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_7">
-               <item>
-                <widget class="QLabel" name="label_11">
-                 <property name="text">
-                  <string>等级</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="dengji"/>
-               </item>
-              </layout>
+              <widget class="QLabel" name="label_22">
+               <property name="text">
+                <string>电话</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_8">
-               <item>
-                <widget class="QLabel" name="label_12">
-                 <property name="text">
-                  <string>皮重</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="pizhong"/>
-               </item>
-              </layout>
+              <widget class="QLineEdit" name="taiPhone"/>
              </item>
             </layout>
            </item>
           </layout>
          </widget>
         </item>
+        <item row="4" column="0">
+         <layout class="QGridLayout" name="gridLayout_7">
+          <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="2">
+           <widget class="QPushButton" name="searchButton">
+            <property name="text">
+             <string>搜索</string>
+            </property>
+           </widget>
+          </item>
+          <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>
+         </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>
        </layout>
       </widget>
      </item>

widget/loginform.ui

@@ -86,8 +86,8 @@
        <rect>
         <x>100</x>
         <y>115</y>
-        <width>181</width>
-        <height>51</height>
+        <width>81</width>
+        <height>41</height>
        </rect>
       </property>
       <property name="styleSheet">
@@ -113,9 +113,9 @@
      <widget class="QPushButton" name="pushButton">
       <property name="geometry">
        <rect>
-        <x>0</x>
-        <y>180</y>
-        <width>91</width>
+        <x>210</x>
+        <y>115</y>
+        <width>81</width>
         <height>41</height>
        </rect>
       </property>

widget/selectvalueform.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>904</width>
-    <height>560</height>
+    <width>1263</width>
+    <height>792</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,15 +16,24 @@
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <widget class="QWidget" name="widget_3" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout_6">
-      <item>
-       <widget class="QPushButton" name="pushButton_3">
-        <property name="text">
-         <string>&lt;返回主页</string>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="6">
+       <widget class="QLineEdit" name="lineEdit_2">
+        <property name="minimumSize">
+         <size>
+          <width>81</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>100</width>
+          <height>16777215</height>
+         </size>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="10">
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -37,14 +46,13 @@
         </property>
        </spacer>
       </item>
-      <item>
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>选择打包商品</string>
-        </property>
-       </widget>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboBox_7"/>
+      </item>
+      <item row="0" column="2">
+       <widget class="QComboBox" name="comboBox_8"/>
       </item>
-      <item>
+      <item row="0" column="12">
        <spacer name="horizontalSpacer_6">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -57,6 +65,80 @@
         </property>
        </spacer>
       </item>
+      <item row="0" column="5">
+       <widget class="QLineEdit" name="lineEdit">
+        <property name="minimumSize">
+         <size>
+          <width>81</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>100</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="7">
+       <widget class="QLineEdit" name="lineEdit_3">
+        <property name="minimumSize">
+         <size>
+          <width>81</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>100</width>
+          <height>16777215</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="8">
+       <widget class="QPushButton" name="pushButton_4">
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>搜索</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="11">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>查看规格</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QComboBox" name="comboBox_6"/>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="comboBox_9"/>
+      </item>
+      <item row="0" column="4">
+       <widget class="QComboBox" name="comboBox_10"/>
+      </item>
+      <item row="0" column="9">
+       <widget class="QPushButton" name="pushButton_5">
+        <property name="maximumSize">
+         <size>
+          <width>50</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>清除</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -392,6 +474,13 @@
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="QPushButton" name="pushButton_3">
+              <property name="text">
+               <string>&lt;返回主页</string>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QPushButton" name="pushButton_2">
               <property name="text">

widget/uncertainweightpackform.cpp

@@ -14,6 +14,7 @@ UncertainWeightPackForm::UncertainWeightPackForm(QWidget *parent) :
     timer->start(500);
     connect(&packConfig,&RemotePackConfig::configUpdate,this,&UncertainWeightPackForm::upconfig);
     connect(&packConfig,&RemotePackConfig::dengJIConfigUp,this,&UncertainWeightPackForm::upDengjiInfo);
+    connect(&specs,&SelectSpecs::change,this,&UncertainWeightPackForm::changeSpecs);
     ui->widget_6->setEnabled(false);
     //筒数限制，true限制
     istubeNumTure = false;
@@ -24,6 +25,8 @@ UncertainWeightPackForm::UncertainWeightPackForm(QWidget *parent) :
         ui->taitou->setText(list.at(0));
         ui->taiPhone->setText(list.at(1));
     }
+    ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+//    ui->pushStart->hide();
 }
 
 UncertainWeightPackForm::~UncertainWeightPackForm()
@@ -134,7 +137,7 @@ void UncertainWeightPackForm::on_addBoxList_clicked()
     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();
@@ -216,6 +219,7 @@ void UncertainWeightPackForm::init()
         ui->mashu->addItem(QString::number(i));
     }
     ui->mashu->setCurrentText("20");
+    specs.getInfo(0,20);
 //    on_addPackList_clicked();
 }
 
@@ -273,3 +277,31 @@ void UncertainWeightPackForm::upDengjiInfo(const QList<DengJiConfigItem> & dengJ
         }
     }
 }
+
+//获取品目信息
+void UncertainWeightPackForm::on_searchButton_clicked()
+{
+    specs.getInfo(0,20);
+}
+
+void UncertainWeightPackForm::changeSpecs()
+{
+    ui->tableWidget_2->clearContents();
+    ui->tableWidget_2->setRowCount(0);
+    for(int i = 0; i < specs.currtInfo.size(); ++i){
+        auto & v = specs.currtInfo.at(i);
+        ui->tableWidget_2->insertRow(i);
+        auto xuanze_btn =  new QRadioButton();
+        connect(xuanze_btn,&QPushButton::clicked,[i,this](){this->xuanze_clicked(i);});
+        ui->tableWidget_2->setCellWidget(i,0,xuanze_btn);
+        ui->tableWidget_2->setItem(i,1,new QTableWidgetItem(v.specs));
+        ui->tableWidget_2->setItem(i,2,new QTableWidgetItem(v.category));
+        ui->tableWidget_2->setItem(i,3,new QTableWidgetItem(v.batch_no));
+        ui->tableWidget_2->setItem(i,4,new QTableWidgetItem(v.color));
+    }
+}
+
+void UncertainWeightPackForm::xuanze_clicked(int row)
+{
+
+}

widget/uncertainweightpackform.h

@@ -10,6 +10,7 @@
 #include "handle/autopackutils.h"
 #include "QTimer"
 #include "handle/danjumuban.h"
+#include "handle/selectspecs.h"
 
 namespace Ui {
 class UncertainWeightPackForm;
@@ -43,10 +44,14 @@ private slots:
 
     void on_tongshuxianzhi_stateChanged(int arg1);
 
+    void on_searchButton_clicked();
+
 public slots:
     void upconfig(const DaBaoConfig & config);
     void upDengjiInfo(const QList<DengJiConfigItem> & dengJis);
     void init();
+    void changeSpecs();
+    void xuanze_clicked(int row);
 
 signals:
     void back();
@@ -61,6 +66,7 @@ private:
     AutoPackUtils aputils;
     DanJuMuBan djmb;
     bool autoRead;
+    SelectSpecs specs;
 
 
     double netNum = 0.00;

widget/uncertainweightpackform.ui

@@ -6,78 +6,761 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1087</width>
-    <height>660</height>
+    <width>1085</width>
+    <height>685</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="minimumSize">
+  <layout class="QGridLayout" name="gridLayout_9">
+   <item row="0" column="1">
+    <widget class="QWidget" name="widget_2" native="true">
+     <property name="maximumSize">
       <size>
-       <width>0</width>
-       <height>30</height>
+       <width>500</width>
+       <height>16777215</height>
       </size>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_23">
-      <property name="topMargin">
+     <layout class="QGridLayout" name="gridLayout_7">
+      <property name="leftMargin">
        <number>0</number>
       </property>
-      <property name="bottomMargin">
+      <property name="rightMargin">
        <number>0</number>
       </property>
-      <item>
-       <widget class="QPushButton" name="pushBack">
-        <property name="text">
-         <string>&lt;返回主页</string>
-        </property>
-       </widget>
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_9">
+        <item>
+         <widget class="QLabel" name="label_25">
+          <property name="minimumSize">
+           <size>
+            <width>41</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>41</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>毛重</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="grossWeight">
+          <property name="minimumSize">
+           <size>
+            <width>141</width>
+            <height>61</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>141</width>
+            <height>61</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>20</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_26">
+          <property name="minimumSize">
+           <size>
+            <width>31</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>31</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>筒数</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="tongshu">
+          <property name="minimumSize">
+           <size>
+            <width>141</width>
+            <height>61</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>141</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>20</pointsize>
+           </font>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_7">
+        <item>
+         <widget class="QPushButton" name="pushStart">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 170, 255);</string>
+          </property>
+          <property name="text">
+           <string>开始打包</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="addBoxList">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 170, 255);</string>
+          </property>
+          <property name="text">
+           <string>添加箱单</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="addPackList">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">background-color: rgb(255, 255, 255);
+color: rgb(0, 170, 255);</string>
+          </property>
+          <property name="text">
+           <string>添加码单</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_18">
+          <item>
+           <widget class="QLabel" name="label_27">
+            <property name="text">
+             <string>码数</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="mashu">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
+             <string/>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="maximumSize">
+             <size>
+              <width>30</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>筒重</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="tongshuguding">
+            <property name="maximumSize">
+             <size>
+              <width>80</width>
+              <height>16777215</height>
+             </size>
+            </property>
+            <item>
+             <property name="text">
+              <string>固定</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>不固定</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_18">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>已开启自动</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="handleRead_2">
+            <property name="minimumSize">
+             <size>
+              <width>71</width>
+              <height>41</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>手动读数</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+      <item row="3" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QCheckBox" name="xiangdanPrint_2">
+          <property name="text">
+           <string>打印箱单</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="madanPrint_2">
+          <property name="text">
+           <string>打印码单</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="showMaoZhong_2">
+          <property name="text">
+           <string>显示毛重</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="tongshuxianzhi">
+          <property name="text">
+           <string>筒数限制</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item>
-       <spacer name="horizontalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item row="4" column="0">
+       <widget class="QWidget" name="widget_3" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="sizeHint" stdset="0">
+        <property name="minimumSize">
          <size>
-          <width>452</width>
-          <height>20</height>
+          <width>450</width>
+          <height>0</height>
          </size>
         </property>
-       </spacer>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_19">
+             <item>
+              <widget class="QLabel" name="label_28">
+               <property name="text">
+                <string>打包班次</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="dabaobanci">
+               <property name="minimumSize">
+                <size>
+                 <width>117</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>999</width>
+                 <height>21</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_20">
+             <item>
+              <widget class="QLabel" name="label_29">
+               <property name="text">
+                <string>机台</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="jitai">
+               <property name="minimumSize">
+                <size>
+                 <width>117</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>999</width>
+                 <height>21</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_21">
+             <item>
+              <widget class="QLabel" name="label_30">
+               <property name="text">
+                <string>等级</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="dengji">
+               <property name="minimumSize">
+                <size>
+                 <width>117</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>999</width>
+                 <height>21</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_22">
+             <item>
+              <widget class="QLabel" name="label_31">
+               <property name="text">
+                <string>皮重</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="pizhong">
+               <property name="minimumSize">
+                <size>
+                 <width>117</width>
+                 <height>21</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>999</width>
+                 <height>21</height>
+                </size>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QWidget" name="widget_4" native="true">
+        <layout class="QGridLayout" name="gridLayout_5">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QWidget" name="widget_5" native="true">
+           <layout class="QGridLayout" name="gridLayout_3">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item row="0" column="0">
+             <layout class="QHBoxLayout" name="horizontalLayout_6">
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_23">
+                <item>
+                 <widget class="QLabel" name="label_32">
+                  <property name="text">
+                   <string>管色</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QComboBox" name="guanse">
+                  <property name="minimumSize">
+                   <size>
+                    <width>117</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_24">
+                <item>
+                 <widget class="QLabel" name="label_33">
+                  <property name="text">
+                   <string>捻向</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QComboBox" name="nianxiang">
+                  <property name="minimumSize">
+                   <size>
+                    <width>117</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <layout class="QVBoxLayout" name="verticalLayout_25">
+                <item>
+                 <widget class="QLabel" name="label_34">
+                  <property name="text">
+                   <string>纸箱</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QComboBox" name="zhixiang">
+                  <property name="minimumSize">
+                   <size>
+                    <width>117</width>
+                    <height>0</height>
+                   </size>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QWidget" name="widget_6" native="true">
+           <layout class="QGridLayout" name="gridLayout">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item row="0" column="0">
+             <layout class="QVBoxLayout" name="verticalLayout_26">
+              <item>
+               <widget class="QLabel" name="label_35">
+                <property name="text">
+                 <string>筒重</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="tongzhong">
+                <property name="minimumSize">
+                 <size>
+                  <width>117</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QWidget" name="widget_7" native="true">
+        <layout class="QGridLayout" name="gridLayout_4">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <item>
+              <widget class="QLabel" name="label_36">
+               <property name="text">
+                <string>码单</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="madan_2">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <layout class="QVBoxLayout" name="verticalLayout_2">
+             <item>
+              <widget class="QLabel" name="label_37">
+               <property name="text">
+                <string>箱单</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QComboBox" name="xiangdan_2">
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>198</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="1" column="0">
+          <layout class="QGridLayout" name="gridLayout_2">
+           <item row="0" column="0">
+            <widget class="QLabel" name="label_38">
+             <property name="text">
+              <string>箱单抬头</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLineEdit" name="taitou"/>
+           </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="label_39">
+             <property name="text">
+              <string>电话</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="3">
+            <widget class="QLineEdit" name="taiPhone"/>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <layout class="QGridLayout" name="gridLayout_8">
+        <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="2">
+         <widget class="QPushButton" name="searchButton">
+          <property name="text">
+           <string>搜索</string>
+          </property>
+         </widget>
+        </item>
+        <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>
+       </layout>
       </item>
-      <item>
-       <widget class="QLabel" name="label_41">
-        <property name="text">
-         <string>不定重打包</string>
-        </property>
+      <item row="8" 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>
-       <spacer name="horizontalSpacer_5">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>451</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_8">
-     <item>
-      <widget class="QWidget" name="widget_8" native="true">
-       <layout class="QVBoxLayout" name="verticalLayout_4">
-        <item>
+   <item row="0" column="0">
+    <widget class="QWidget" name="widget_8" native="true">
+     <layout class="QGridLayout" name="gridLayout_12">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <layout class="QGridLayout" name="gridLayout_11">
+        <item row="0" column="0">
          <layout class="QHBoxLayout" name="horizontalLayout_2">
           <item>
            <widget class="QLabel" name="label_42">
@@ -130,636 +813,94 @@
           </item>
          </layout>
         </item>
-        <item>
-         <widget class="QTableWidget" name="tableWidget">
-          <property name="minimumSize">
-           <size>
-            <width>562</width>
-            <height>0</height>
-           </size>
+        <item row="0" column="1">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="maximumSize">
+          <property name="sizeHint" stdset="0">
            <size>
-            <width>9999</width>
-            <height>16777215</height>
+            <width>18</width>
+            <height>20</height>
            </size>
           </property>
-          <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>
-          <column>
-           <property name="text">
-            <string>箱号</string>
-           </property>
-          </column>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QWidget" name="widget_2" native="true">
-       <property name="maximumSize">
-        <size>
-         <width>494</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_7">
-          <item>
-           <layout class="QGridLayout" name="gridLayout_7">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_25">
-              <property name="minimumSize">
-               <size>
-                <width>41</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>41</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>毛重</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="grossWeight">
-              <property name="minimumSize">
-               <size>
-                <width>141</width>
-                <height>61</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>141</width>
-                <height>61</height>
-               </size>
-              </property>
-              <property name="font">
-               <font>
-                <pointsize>20</pointsize>
-               </font>
-              </property>
-              <property name="text">
-               <string>0</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_26">
-              <property name="minimumSize">
-               <size>
-                <width>31</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>31</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>筒数</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="tongshu">
-              <property name="minimumSize">
-               <size>
-                <width>141</width>
-                <height>61</height>
-               </size>
-              </property>
-              <property name="font">
-               <font>
-                <pointsize>20</pointsize>
-               </font>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
-            <item>
-             <widget class="QPushButton" name="pushStart">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>50</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">background-color: rgb(255, 255, 255);
-color: rgb(0, 170, 255);</string>
-              </property>
-              <property name="text">
-               <string>开始打包</string>
-              </property>
-              <property name="checkable">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_15">
-              <item>
-               <widget class="QPushButton" name="addBoxList">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>50</height>
-                 </size>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true">background-color: rgb(255, 255, 255);
-color: rgb(0, 170, 255);</string>
-                </property>
-                <property name="text">
-                 <string>添加箱单</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="addPackList">
-                <property name="enabled">
-                 <bool>true</bool>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>0</width>
-                  <height>50</height>
-                 </size>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true">background-color: rgb(255, 255, 255);
-color: rgb(0, 170, 255);</string>
-                </property>
-                <property name="text">
-                 <string>添加码单</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </item>
-         </layout>
+         </spacer>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_5">
-          <item>
-           <widget class="QCheckBox" name="xiangdanPrint_2">
-            <property name="text">
-             <string>打印箱单</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="madanPrint_2">
+        <item row="0" column="2">
+         <layout class="QGridLayout" name="gridLayout_10">
+          <item row="0" column="0">
+           <widget class="QPushButton" name="pushButton">
             <property name="text">
-             <string>打印码单</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
+             <string>未同步列表</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="showMaoZhong_2">
+          <item row="0" column="1">
+           <widget class="QPushButton" name="pushButton_2">
             <property name="text">
-             <string>显示毛重</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
+             <string>同步</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="tongshuxianzhi">
+          <item row="0" column="2">
+           <widget class="QPushButton" name="pushButton_3">
             <property name="text">
-             <string>筒数限制</string>
+             <string>接续</string>
             </property>
            </widget>
           </item>
          </layout>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_3">
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_18">
-            <item>
-             <widget class="QLabel" name="label_27">
-              <property name="text">
-               <string>码数</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="mashu">
-              <property name="editable">
-               <bool>true</bool>
-              </property>
-              <property name="currentText">
-               <string/>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QLabel" name="label_2">
-              <property name="maximumSize">
-               <size>
-                <width>30</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>筒重</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="tongshuguding">
-              <property name="maximumSize">
-               <size>
-                <width>80</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <item>
-               <property name="text">
-                <string>固定</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>不固定</string>
-               </property>
-              </item>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_18">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>已开启自动</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="handleRead_2">
-              <property name="minimumSize">
-               <size>
-                <width>71</width>
-                <height>41</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>手动读数</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QWidget" name="widget_3" native="true">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>450</width>
-            <height>0</height>
-           </size>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_6">
-           <item row="0" column="0">
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_19">
-               <item>
-                <widget class="QLabel" name="label_28">
-                 <property name="text">
-                  <string>打包班次</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="dabaobanci"/>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_20">
-               <item>
-                <widget class="QLabel" name="label_29">
-                 <property name="text">
-                  <string>机台</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="jitai"/>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_21">
-               <item>
-                <widget class="QLabel" name="label_30">
-                 <property name="text">
-                  <string>等级</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="dengji"/>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_22">
-               <item>
-                <widget class="QLabel" name="label_31">
-                 <property name="text">
-                  <string>皮重</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QComboBox" name="pizhong"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="widget_4" native="true">
-          <layout class="QGridLayout" name="gridLayout_5">
-           <item row="0" column="0">
-            <widget class="QWidget" name="widget_5" native="true">
-             <layout class="QGridLayout" name="gridLayout_3">
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item row="0" column="0">
-               <layout class="QHBoxLayout" name="horizontalLayout_6">
-                <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_23">
-                  <item>
-                   <widget class="QLabel" name="label_32">
-                    <property name="text">
-                     <string>管色</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="guanse"/>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_24">
-                  <item>
-                   <widget class="QLabel" name="label_33">
-                    <property name="text">
-                     <string>捻向</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="nianxiang"/>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <layout class="QVBoxLayout" name="verticalLayout_25">
-                  <item>
-                   <widget class="QLabel" name="label_34">
-                    <property name="text">
-                     <string>纸箱</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item>
-                   <widget class="QComboBox" name="zhixiang"/>
-                  </item>
-                 </layout>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QWidget" name="widget_6" native="true">
-             <layout class="QGridLayout" name="gridLayout">
-              <property name="leftMargin">
-               <number>0</number>
-              </property>
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <property name="rightMargin">
-               <number>0</number>
-              </property>
-              <property name="bottomMargin">
-               <number>0</number>
-              </property>
-              <item row="0" column="0">
-               <layout class="QVBoxLayout" name="verticalLayout_26">
-                <item>
-                 <widget class="QLabel" name="label_35">
-                  <property name="text">
-                   <string>筒重</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QComboBox" name="tongzhong"/>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QWidget" name="widget_7" native="true">
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="0" column="0">
-            <layout class="QVBoxLayout" name="verticalLayout_27">
-             <item>
-              <widget class="QLabel" name="label_36">
-               <property name="text">
-                <string>码单</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="madan_2">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="label_37">
-               <property name="text">
-                <string>箱单</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="xiangdan_2">
-               <property name="enabled">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="verticalSpacer_3">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="1">
-            <layout class="QVBoxLayout" name="verticalLayout_28">
-             <item>
-              <widget class="QLabel" name="label_38">
-               <property name="text">
-                <string>箱单抬头</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="taitou"/>
-             </item>
-             <item>
-              <widget class="QLabel" name="label_39">
-               <property name="text">
-                <string>电话</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLineEdit" name="taiPhone"/>
-             </item>
-             <item>
-              <spacer name="verticalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>40</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </item>
-           <item row="0" column="2">
-            <layout class="QVBoxLayout" name="verticalLayout">
-             <item>
-              <widget class="QLabel" name="label_40">
-               <property name="text">
-                <string>备注</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QTextEdit" name="beizhu"/>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </item>
        </layout>
-      </widget>
-     </item>
-    </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QTableWidget" name="tableWidget">
+        <property name="minimumSize">
+         <size>
+          <width>562</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>9999</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <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>
+        <column>
+         <property name="text">
+          <string>箱号</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>