添加内容

configinfo.cpp

@@ -3,6 +3,13 @@
 ConfigInfo::ConfigInfo()
 {
     //TODO: 小宋，给每个成员设置默认值
+    baseUrl = "";
+    packId = 0;
+    printerName = "";
+    portName = "";
+    portBaudRate = "";
+    portType = 0;
+    savePrinter = true;
 }
 
 

handle/packinfoseed2server.cpp

@@ -1,11 +1,12 @@
 #include "packinfoseed2server.h"
 #include <QTimer>
 #include <QJsonDocument>
+#include "globalinfo.h"
 
 PackInfoSeed2Server::PackInfoSeed2Server(PackInfoManger * manger, QObject *parent, bool autoSync) : QObject(parent),
     _manger(manger),_autoSync(autoSync)
 {
-    connect(&_requst,&HttpRequest::request,this,&PackInfoSeed2Server::_requst);
+    connect(&_requst,&HttpRequest::result,this,&PackInfoSeed2Server::result);
     _netErrorCount = 0;
     _oneSyncError = 0;
     log = PQ::PQLogManger::this_()->getLog("PackInfoSeed2Server");
@@ -26,6 +27,8 @@ void PackInfoSeed2Server::doSend()
         _current = _queue.first();
         // TODO:小宋， 发送 _current 到服务器
         //docs： http://doc.vanlai.net:3001/web/#/1?page_id=64
+        QString url = GlobalInfo::this_()->config().baseUrl+"/v1/product/pending";
+        _requst.post(url,_current->toObject());
     }
 }
 

handle/projectinfomanger.cpp

@@ -7,7 +7,7 @@
 
 ProjectInfoManger::ProjectInfoManger(PackInfoManger *manger, QObject *parent) : QObject(parent),_manger(manger)
 {
-
+    connect(&_requst,&HttpRequest::result,this,&ProjectInfoManger::result);
 }
 
 bool ProjectInfoManger::loadServerList()
@@ -39,6 +39,8 @@ void ProjectInfoManger::doSendLoad()
 {
     //TODO:小宋，请求获取批号列表信息
     // docs: http://doc.vanlai.net:3001/web/#/1?page_id=60
+    QString url = GlobalInfo::this_()->config().baseUrl+"v1/goods/list";
+    _requst.get(url);
 }
 
 void ProjectInfoManger::doSendCreate()
@@ -48,6 +50,9 @@ void ProjectInfoManger::doSendCreate()
         QSharedPointer<ProjectInfo> info = _pushQueue.first();
         // TODO: 小宋， 调用新建批号的接口
         // docs: http://doc.vanlai.net:3001/web/#/1?page_id=59
+
+        QString url = GlobalInfo::this_()->config().baseUrl+"v1/goods/add";
+        _requst.post(url,info->toObject());
     } else {
         _status = IDIL;
         QTimer::singleShot(0,this,&ProjectInfoManger::doSendLoad);
@@ -145,4 +150,8 @@ void ProjectInfoManger::hanldeServerList(QJsonArray & ary,bool inServer)
 
     //TODO: 小宋 解析返回的到 _serverInfo
     // docs: http://doc.vanlai.net:3001/web/#/1?page_id=60
+    for(int i = 0;i<ary.size();i++){
+        _serverInfo.append(ProjectInfo::fromObject(ary.at(i).toObject()));
+    }
+
 }

handle/projectinfomanger.h

@@ -49,6 +49,7 @@ private:
     ReqStatus _status;
     QQueue<QSharedPointer<ProjectInfo>> _pushQueue;
     PackInfoManger * _manger;
+    HttpRequest _requst;
 //saveed;
     QList<QSharedPointer<ProjectInfo>> _serverInfo;
     QList<QSharedPointer<ProjectInfo>> _cacheInfo;

pqQtlib

@@ -1 +1 @@
-Subproject commit 22050c82648c33d17c7b589177061ece37db3fb0
+Subproject commit 8cd7c8b837f42a918bbe7cde3c9310a8ffedf53f

struct_/packinfo.cpp

@@ -97,6 +97,10 @@ QJsonObject PackInfo::toObject()
 {
     QJsonObject ret;
     ret.insert("time",QString::number(this->time()));
+    ret.insert("tube_number",QString::number(this->tube_number()));
+    ret.insert("gross_weight",QString::number(this->gross_weight()));
+    ret.insert("net_weight",QString::number(this->net_weight()));
+    ret.insert("goods_id",QString::number(this->goodsID()));
 
     //todo: 小宋 ? _boxes存那里去了？
     ret.insert("quantity",quantity);
@@ -112,6 +116,12 @@ QJsonObject PackInfo::toObject()
     ret.insert("customer",customer);
     ret.insert("batch_no",_info->batch_no);
 
+    QJsonArray det;
+    for(int i = 0;i<_boxes.size();i++){
+        det.append(_boxes.at(i)->toObject());
+    }
+    ret.insert("details",det);
+
     return ret;
 }
 
@@ -138,6 +148,14 @@ QSharedPointer<PackInfo> PackInfo::fromObject(QJsonObject &obj)
     ret->remark = obj.value("remark").toString();
     ret->telephone = obj.value("telephone").toString();
     ret->customer = obj.value("customer").toString();
+
+    QJsonArray det = obj.value("details").toArray();
+
+    for(int i = 0;i<det.size();i++){
+        QJsonObject obj = det.at(i).toObject();
+        ret->_boxes.append(BoxInfo::fromObject(ret,obj));
+    }
+
     return ret;
 }
 

widget/settingsform.cpp

@@ -56,6 +56,6 @@ void SettingsForm::on_save_btn_clicked()
     obj.insert("portName",ui->portName->currentText());
     obj.insert("portBaudRate",ui->portBaudRate->currentText());
     obj.insert("portType",ui->comboBox_2->currentIndex());
-    config.Set(obj);
+    PQ::ConfigFile::writeObject("Config.json",obj);
     QMessageBox::information(this,"提示","请重新启动程序，以使用新配置！");
 }