提交

configinfo.cpp

@@ -2,29 +2,58 @@
 
 ConfigInfo::ConfigInfo()
 {
-    baseUrl = "http://erp.itwsw.cn/api";
+//    baseUrl = "http://erp.itwsw.cn/api";
+    loginUrl = "http://erp.itwsw.cn/api/v1/signin";
+    autoPackUrl = "http://erp.itwsw.cn/api/v1/product/pending";
+    configUrl = "http://erp.itwsw.cn/api/v1/configuration";
+    selectValueUrl = "http://erp.itwsw.cn/api/v1/goods/list";
+    levelUrl = "http://erp.itwsw.cn/api/v1/level/list";
+
     packId = 1031;
+
     printerName = "Deli DL-820T";
 
-        Config();
-        QFileInfo fileInfo(FileName);
-       if(fileInfo.exists())
-       {
-            qDebug()<<"配置文件已存在";
-            loginUrl = Get("url","loginUrl").toString();//登录接口
-            autoPackUrl = Get("url","autoPackUrl").toString();  //待入库产品添加接口
-            configUrl = Get("url","configUrl").toString();//配置接口
-       }else{
-            qDebug()<<"配置文件不存在";
-            Set("url","autoPackUrl","http://erp.itwsw.cn/api/v1/product/pending");
-            Set("url","loginUrl","http://erp.itwsw.cn/api/v1/signin");
-            Set("url","configUrl","http://erp.itwsw.cn/api/v1/configuration");
-       }
+    Init();
+
 }
 
-void ConfigInfo::Config()
+void ConfigInfo::Init()
 {
+
     m_psetting = new QSettings(FileName, QSettings::IniFormat);
+
+    //判断配置文件是否存在
+    QFileInfo fileInfo(FileName);
+   if(fileInfo.exists())
+   {
+        qDebug()<<"配置文件已存在";
+        //url接口地址
+        loginUrl = Get("url","loginUrl").toString();//登录接口
+        autoPackUrl = Get("url","autoPackUrl").toString();  //待入库产品添加接口
+        configUrl = Get("url","configUrl").toString();//配置接口
+        selectValueUrl = Get("url","selectValueUrl").toString();//商品列表接口
+        levelUrl = Get("url","levelUrl").toString();//等级列表接口
+
+        //本机用户信息
+        packId = Get("user","packId").toInt();//打包点id
+
+        //硬件
+        printerName = Get("hardware","printerName").toString();//打印机名称
+   }else{
+        qDebug()<<"配置文件不存在";
+        //url接口地址
+        Set("url","autoPackUrl","http://erp.itwsw.cn/api/v1/product/pending");
+        Set("url","loginUrl","http://erp.itwsw.cn/api/v1/signin");
+        Set("url","configUrl","http://erp.itwsw.cn/api/v1/configuration");
+        Set("url","selectValueUrl","http://erp.itwsw.cn/api/v1/goods/list");
+        Set("url","levelUrl","http://erp.itwsw.cn/api/v1/level/list");
+
+        //本机用户信息
+        Set("user","packId",1031);
+
+        //硬件
+        Set("hardware","printerName","Deli DL-820T");
+   }
 }
 
 void ConfigInfo::Set(QString qstrnodename,QString qstrkeyname,QVariant qvarvalue)

configinfo.h

@@ -12,25 +12,30 @@ class ConfigInfo
 public:
     ConfigInfo();
 
-    QString baseUrl;
+//    QString baseUrl;
     quint16 packId;
     QString printerName;
 
-    //待入库产品添加接口
-    QString autoPackUrl;
 
-    //登录接口
-    QString loginUrl;
+    QString autoPackUrl;//待入库产品添加接口
+
+    QString loginUrl;//登录接口
+
+    QString configUrl;//配置接口
+
+    QString selectValueUrl;//商品列表接口
+
+    QString levelUrl;//等级列表接口
+
 
-    //配置接口
-    QString configUrl;
 
-    void Config();
     void Set(QString qstrnodename,QString qstrkeyname,QVariant qvarvalue);
     QVariant Get(QString qstrnodename,QString qstrkeyname);
 private:
     QString FileName = QCoreApplication::applicationDirPath() + "/Config.ini";
     QSettings *m_psetting;
+
+    void Init();
 };
 
 struct UserInfo

handle/autopackutils.cpp

@@ -15,8 +15,6 @@ AutoPackUtils::AutoPackUtils()
 void AutoPackUtils::doSend(QSharedPointer<PackInfo> &info)
 {
     if(info.isNull()) return;
-    //把数据添加到数据库里
-    insertProductSQL(info);
     //TODO：发送码单 packinfo 数据, 转换为 json数据发送
     QJsonObject json = toJson(info);
     _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
@@ -62,6 +60,7 @@ void AutoPackUtils::insertDetailsSQL(QSharedPointer<BoxInfo> boxes,QString codeS
 //把PackInfo添加到product数据库里；
 void AutoPackUtils::insertProductSQL(QSharedPointer<PackInfo> packes)
 {
+    if(packes.isNull()) return;
     //保存码单，上传服务器成功后，以codeSingle为条件更改同步字段；
     this->codeSingle = packes->codeSingle();
 

handle/autopackutils.h

@@ -9,7 +9,7 @@
 #include "globalinfo.h"
 #include "danjumuban.h"
 
-//AutoPackFrom工具类
+//自动打包工具类
 class AutoPackUtils : public QObject
 {
 

handle/danjumuban.cpp

@@ -72,9 +72,12 @@ QImage DanJuMuBan::printBoxInfo(QString bar,QSharedPointer<BoxInfo> info)
     painter.drawText(67*5,39*5,QString::number(info->tube_number));//datalist.at(2));
     painter.drawText(21*5,46*5,QString::number(pinfo->level_id));//datalist.at(3));
     painter.drawText(67*5,46*5,pinfo->info().twist_type);//datalist.at(4));
-    painter.drawText(21*5,53*5,info->caseNumber());//datalist.at(5));
     painter.drawText(67*5,53*5,pinfo->info().bucket_color);//datalist.at(6));
 
+    font.setPixelSize(17);
+    painter.setFont(font);
+    painter.drawText(21*5,53*5,info->caseNumber());//datalist.at(5));
+
 
 //    painter.drawText(4*5,75*5," 电话"+telephone+"传真"+fax);
 

handle/remotepackconfig.cpp

@@ -142,7 +142,7 @@ 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";
+    QString url = GlobalInfo::this_()->config().levelUrl;
     _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
     _request.get(url);
 

widget/autopackform.cpp

@@ -32,11 +32,15 @@ void AutoPackForm::init()
     for(int i = 1;i<20;i++){
         ui->comboBox->addItem(QString::number(i));
     }
+    ui->comboBox->setEditText("20");
     on_addPackList_clicked();
 }
 
 void AutoPackForm::on_addPackList_clicked()
 {
+
+    //把数据添加到数据库里
+    aputils.insertProductSQL(packinfo);
     //TODO： 缓存箱单数据，页面显示情空
     aputils.doSend(packinfo);
     //TODO： 初始化码单信息

widget/packdetailform.cpp

@@ -31,9 +31,9 @@ void PackDetailForm::changeTable(QList<QMap<QString,QString>> productList)
     ui->tableWidget->setColumnCount(11);
     for(int i = 0;i<productList.size();i++){
         ui->tableWidget->insertRow(i);
-        ui->tableWidget->setItem(i,0,new QTableWidgetItem(productList.at(i).value("tongbu")));
+        ui->tableWidget->setItem(i,0,new QTableWidgetItem(productList.at(i).value("tongbu") == "0" ? "未同步" : "同步"));
         ui->tableWidget->setItem(i,1,new QTableWidgetItem(productList.at(i).value("code_single")));
-        ui->tableWidget->setItem(i,2,new QTableWidgetItem(productList.at(i).value("batch_no")+"_"+productList.at(i).value("batch_no")));
+        ui->tableWidget->setItem(i,2,new QTableWidgetItem(productList.at(i).value("batch_no")));
         ui->tableWidget->setItem(i,3,new QTableWidgetItem(productList.at(i).value("gross_weight")));
         ui->tableWidget->setItem(i,4,new QTableWidgetItem(productList.at(i).value("net_weight")));
         ui->tableWidget->setItem(i,5,new QTableWidgetItem(productList.at(i).value("quantity")));
@@ -51,7 +51,7 @@ void PackDetailForm::changeTable(QList<QMap<QString,QString>> productList)
 //同步
 void PackDetailForm::tongbu_clicked()
 {
-
+    qDebug()<<"";
 }
 
 void PackDetailForm::productList()
@@ -60,6 +60,7 @@ void PackDetailForm::productList()
     productSqlList.append("goods_id");
     productSqlList.append("code_single");
     productSqlList.append("quantity");
+    productSqlList.append("batch_no");
     productSqlList.append("level_id");
     productSqlList.append("tube_number");
     productSqlList.append("gross_weight");

widget/selectvalueform.cpp

@@ -22,7 +22,7 @@ void SelectValueForm::getInfo(int page, int pageListNum)
     nowPage = page;
     this->pageListNum = pageListNum;
     auto glo = GlobalInfo::this_();
-     auto url = glo->config().baseUrl + QString("/v1/goods/list?page=%1&limit=%2").arg(nowPage).arg(pageListNum);
+     auto url = glo->config().selectValueUrl + QString("?page=%1&limit=%2").arg(nowPage).arg(pageListNum);
      _request.setUserToken(QString::number(GlobalInfo::this_()->user().accountId),GlobalInfo::this_()->user().acessToken);
      _request.get(url);