界面数据显示

handle/httprequest.cpp

@@ -81,10 +81,10 @@ void HttpRequest::finishRequest(QNetworkReply * reply)
 
 void HttpRequest::initRequest(QNetworkRequest & req, bool post)
 {
-//    if(!_aid.isEmpty()){
-        req.setRawHeader("Auid",QString::number(GlobalInfo::this_()->user().accountId).toUtf8());
-        req.setRawHeader("Access-Token",GlobalInfo::this_()->user().acessToken.toUtf8());
-//    }
+    if(!_aid.isEmpty()){
+        req.setRawHeader("Auid",_aid.toUtf8());
+        req.setRawHeader("Access-Token",_token.toUtf8());
+    }
 //    if(post)
 //    {
 //        req.setHeader(QNetworkRequest::ContentTypeHeader,"multipart/form-data");

handle/httprequest.h

@@ -7,7 +7,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QHttpMultiPart>
-#include "globalinfo.h"
 
 class HttpRequest : public QObject
 {

handle/remotepackconfig.cpp

@@ -41,6 +41,19 @@ RemotePackConfig::RemotePackConfig(QObject *parent) : QObject(parent)
 
 //   parsefUNS.insert("A2000213",[this](const QJsonObject & obj){this->_config.buDingZhongTongShuFanWei = this->getConfigpAIR(obj);});
 //   parsefUNS.insert("A2000214",[this](const QJsonObject & obj){this->_config.dingZhongTongShuFanwei = this->getConfigpAIR(obj);});
+   parsefUNS.insert("A2000215",[this](const QJsonObject & obj){this->_config.morenRuKuMaDanFenShu = this->getConfigInt(obj);});
+//   parsefUNS.insert("A2000216",[this](const QJsonObject & obj){this->_config.buDingZhongXianZhiFanWei = this->getConfigpAIR(obj);});
+   parsefUNS.insert("A2000217",[this](const QJsonObject & obj){this->_config.daBaoZhuangDaYinXiangDanFenShu = this->getConfigInt(obj);});
+   parsefUNS.insert("A2000218",[this](const QJsonObject & obj){this->_config.daBaoZhuangMaoZhongFanWei = this->getConfigInt(obj);});
+   parsefUNS.insert("A2000219",[this](const QJsonObject & obj){this->_config.ziDongDaBaoXiangZhongFanWei = this->getConfigInt(obj);});
+   parsefUNS.insert("A2000220",[this](const QJsonObject & obj){this->_config.zidongDaBaoMaoZhongFanWei = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000300",[this](const QJsonObject & obj){this->_config.morenDaYinHuaMaDan = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000301",[this](const QJsonObject & obj){this->_config.morenXiaoShouXianShiJinE = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000302",[this](const QJsonObject & obj){this->_config.morenDayinXiaoShouMinXidan = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000303",[this](const QJsonObject & obj){this->_config.morenDaYinXIaoShouDan = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000304",[this](const QJsonObject & obj){this->_config.morenXianShiQianKuan = this->getConfigInt(obj);});
+   parsefUNS.insert("A3000305",[this](const QJsonObject & obj){this->_config.xiaoShouEJingDu = this->getConfigInt(obj);});
+
 
   //TODO:http://doc.vanlai.net:3001/web/#/1?page_id=57 补全剩下
 //http://erp.itwsw.cn/#/packageCon
@@ -51,11 +64,35 @@ RemotePackConfig::RemotePackConfig(QObject *parent) : QObject(parent)
 QList<DIYPackConfig> RemotePackConfig::getDiys(const QJsonObject & data)
 {
     // TODO:
+    QJsonArray value_array = data["value"].toArray();
+    DIYPackConfig DTYConfig;
+    QList<DIYPackConfig> DTYConfigList;
+    for(int i = 0;i<value_array.size();i++){
+        QJsonObject obj = value_array.at(i).toObject();
+        DTYConfig.type = obj["packaging_type"].toInt();
+        DTYConfig.danDianXiaXian = obj["danding_lower_limit"].toInt();
+        DTYConfig.danDianShangXian = obj["danding_upper_limit"].toInt();
+        DTYConfig.jingZhongXiaXian = obj["net_weight_lower_limit"].toInt();
+        DTYConfig.jingZhongShangXian = obj["net_weight_upper_limit"].toInt();
+        DTYConfigList.append(DTYConfig);
+    }
+    return DTYConfigList;
 }
 
 QList<POYPackConfig> RemotePackConfig::getPoys(const QJsonObject & data)
 {
         // TODO:
+    QJsonArray value_array = data["value"].toArray();
+    POYPackConfig POYConfig;
+    QList<POYPackConfig> POYConfigList;
+    for(int i = 0;i<value_array.size();i++){
+        QJsonObject obj = value_array.at(i).toObject();
+        POYConfig.type = obj["packaging_type"].toInt();
+        POYConfig.jingZhongXiaXian = obj["net_weight_lower_limit"].toInt();
+        POYConfig.jingZhongShangXian = obj["net_weight_upper_limit"].toInt();
+        POYConfigList.append(POYConfig);
+    }
+    return POYConfigList;
 }
 
 void RemotePackConfig::refConfig()
@@ -88,12 +125,27 @@ void RemotePackConfig::result(int code, const QJsonObject & body)
         refDengJiList();
     } else {
         // TODO： 解析等级列表
+        QJsonArray object = body.value("data").toArray();
+        DengJiConfigItem dengJiConfig;
+        for(int i = 0; i<object.size();i++){
+            QJsonObject obj = object.at(i).toObject();
+            dengJiConfig.id = obj.value("level_id").toInt();
+            dengJiConfig.value = obj.value("name").toString();
+            dengJiConfig.isEnable = obj.value("is_disable").toBool();
+            dengji.append(dengJiConfig);
+        }
+        emit dengJIConfigUp(dengji);
     }
 }
 
 void RemotePackConfig::refDengJiList()
 {
+    getDdengji = true;
     // todo: http://doc.vanlai.net:3001/web/#/1?page_id=35
+    QString url = GlobalInfo::this_()->config().baseUrl+"/v1/level/list";
+    _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
+    _request.get(url);
+
 }
 
 bool RemotePackConfig::getConfigBool(const QJsonObject & data)

mainwindow.cpp

@@ -24,6 +24,7 @@ void MainWindow::on_pushAuto_clicked()
     ui->stackedWidget->setCurrentWidget(ui->pageSelectValue);
     ui->pageSelectValue->getInfo(1,20);
     ui->pageSelectValue->setStatus(1);
+    ui->pageAutoPack->init();
 }
 
 void MainWindow::pageStatusChange(const ProjectInfo & info, int status)

mainwindow.h

@@ -2,8 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <widget/selectvalueform.h>
-#include "QObject"
+#include "configinfo.h"
 
 QT_BEGIN_NAMESPACE
 namespace Ui { class MainWindow; }

widget/autopackform.cpp

@@ -25,7 +25,9 @@ void AutoPackForm::init()
     // TODO： 页面进入初始化
     ui->pushStart->setChecked(false);
     ui->widget->setEnabled(true);
-//    ui->madan
+    packConfig.refConfig();
+    connect(&packConfig,&RemotePackConfig::configUpdate,this,&AutoPackForm::upconfig);
+    connect(&packConfig,&RemotePackConfig::dengJIConfigUp,this,&AutoPackForm::upDengjiInfo);
 }
 
 void AutoPackForm::on_addPackList_clicked()
@@ -59,11 +61,48 @@ void AutoPackForm::upconfig(const DaBaoConfig &config)
 //    ui->xiangdan->clear();
 //    ui->madan->clear();
     // TODO：打包配置更新
+    //机台
+    ui->jitai->clear();
+    ui->jitai->addItems(config.jitai);
+
+    //打包工班次
+    ui->comboBox_2->clear();
+    ui->comboBox_2->addItems(config.daBaoGongBanCi);
+
+    //皮重
+    ui->pizhong->clear();
+    for(int i = 0;i<config.xiangzhong.size();i++){
+        ui->pizhong->addItem(QString::number(config.xiangzhong.at(i)));
+    }
+
+    //管色
+    ui->guanse->clear();
+    ui->guanse->addItems(config.guanse);
+
+    //捻向
+    ui->nianxiang->clear();
+    ui->nianxiang->addItems(config.nianxiang);
+
+    //纸箱
+    ui->zhixiang->clear();
+    ui->zhixiang->addItems(config.zhixiang);
+
+    //筒重
+    ui->tongzhong->clear();
+    for(int i = 0;i<config.tongZhong.size();i++){
+        ui->tongzhong->addItem(QString::number(config.tongZhong.at(i)));
+    }
 }
 
 void AutoPackForm::upDengjiInfo(const QList<DengJiConfigItem> & dengJis)
 {
 // TODO： 等级信息更新
+    ui->dengji->clear();
+    for(int i = 0;i<dengJis.size();i++){
+        if(!dengJis.at(i).isEnable){
+            ui->dengji->addItem(dengJis.at(i).value,dengJis.at(i).id);
+        }
+    }
 }
 
 void AutoPackForm::on_pushStart_clicked()
@@ -88,6 +127,11 @@ void AutoPackForm::on_addBoxList_clicked()
     if(packinfo.isNull()) return;
     auto box = packinfo->addBoxInfo();
     //TODO： 添加箱单 数据
+    box->box_weight = ui->pizhong->currentText().toInt();
+    box->tube_number = ui->tongshu->text().toInt();
+    box->bucket_weight = ui->pizhong->currentText().toInt()*ui->tongshu->text().toInt();
+    box->gross_weight = ui->grossWeight_2->text().toInt();
+    box->box_weight = ui->netWeight_2->text().toInt();
+    box->remark = ui->beizhu->toPlainText();
     //TODO: 缓存数据，显示数据
-
 }

widget/autopackform.h

@@ -5,6 +5,7 @@
 #include "globalinfo.h"
 #include "handle/remotepackconfig.h"
 #include "packinfo.h"
+#include "httprequestid.h"
 
 namespace Ui {
 class AutoPackForm;
@@ -43,6 +44,9 @@ private:
     ProjectInfo _info;
     QSharedPointer<PackInfo> packinfo;
     QMap<QString,DengJiConfigItem> dengjiMap;// <name,详细信息>
+    RemotePackConfig packConfig;
+    HttpRequest _request;
+
 };
 
 #endif // AUTOPACKFORM_H

widget/autopackform.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1087</width>
-    <height>653</height>
+    <height>677</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -603,7 +603,7 @@ color: rgb(0, 170, 255);</string>
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="tongzhong"/>
+             <widget class="QComboBox" name="pizhong"/>
             </item>
            </layout>
           </item>
@@ -663,7 +663,7 @@ color: rgb(0, 170, 255);</string>
              </widget>
             </item>
             <item>
-             <widget class="QComboBox" name="tongzhong_2"/>
+             <widget class="QComboBox" name="tongzhong"/>
             </item>
            </layout>
           </item>

widget/selectvalueform.cpp

@@ -23,13 +23,14 @@ void SelectValueForm::getInfo(int page, int pageListNum)
     this->pageListNum = pageListNum;
     auto glo = GlobalInfo::this_();
      auto url = glo->config().baseUrl + QString("/v1/goods/list?page=%1&limit=%2").arg(nowPage).arg(pageListNum);
+     _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
      _request.get(url);
 
 }
 
 void SelectValueForm::result(int code, const QJsonObject & body)
 {
-    qDebug()<<body;
+//    qDebug()<<body;
     if(body.value("code").toInt(404) != 200){
         nowPage = 0;
         pageListNum = 20;