git-svn-id: file:///srv/xfl/svn/SVN/wzx/SpeedNumCube@19159 2e29f1fe-100b-dc43-ad61-23effca57775

sncprojects/app/SpeedNumCube/speednumcube.pro

@@ -16,12 +16,14 @@ INCLUDEPATH +=../../lib/SNCHelpMe
 INCLUDEPATH +=../../lib/SNCCube
 INCLUDEPATH +=../../lib/SNCNumCheck
 INCLUDEPATH +=../../lib/SNCRiddle
+INCLUDEPATH +=../../lib/SNCWool
 INCLUDEPATH +=../../lib/SNCzxsh
 INCLUDEPATH +=../../lib/SNCMain
 INCLUDEPATH +=../../lib/WSNumChk
 INCLUDEPATH +=../../lib/SNCUser
 INCLUDEPATH +=../../lib/WSSSO
 INCLUDEPATH +=../../lib/WSCube
+INCLUDEPATH +=../../lib/WSWOOL
 LIBS += ../../output/sncdatabase.dll\
         ../../output/snccore.dll\
         ../../output/sncmain.dll

sncprojects/lib/SNCCore/fileprepare.cpp

@@ -2,7 +2,7 @@
 #include "numberreg.h"
 #include "sncdatabase.h"
 #include <QtCore>
-FilePrepare::FilePrepare(QString fileName, QString fileType, bool isMulti,QString moduleID,QString clientID)
+FilePrepare::FilePrepare(QString fileName, QString fileType, bool isMulti, QString moduleID, QString clientID)
 {
     this->oriFileName = fileName;
     this->fileType = fileType;

sncprojects/lib/SNCCore/fileprepare.h

@@ -8,7 +8,7 @@
 class SNCCORESHARED_EXPORT FilePrepare
 {
 public:
-    FilePrepare(QString fileName,QString fileType,bool isMulti,QString moduleID,QString clientID);
+    FilePrepare(QString fileName, QString fileType, bool isMulti, QString moduleID, QString clientID);
     bool prepare();
     QString getRtnMsg();
     QString getLastUploadFileName();

sncprojects/lib/SNCDataBase/sncdatabase.cpp

@@ -171,6 +171,8 @@ bool SNCDataBase::createConnection(QString password, QString path)
         query.exec("CREATE TABLE USER.WOOL_CHECK_DEALING( \
                    TASKID VARCHAR(100) PRIMARY KEY, \
                    USERCODE VARCHAR(100), \
+                   PNUMFILETYPE VARCHAR(10), \
+                   ORIGFILENAME VARCHAR(200), \
                    HMZS INTEGER, \
                    FEE_COUNT INTEGER, \
                    CREATE_TIME VARCHAR(100), \
@@ -189,6 +191,8 @@ bool SNCDataBase::createConnection(QString password, QString path)
         query.exec("CREATE TABLE USER.WOOL_CHECK_FINISHED(\
                    TASKID VARCHAR(100) PRIMARY KEY, \
                    USERCODE VARCHAR(100), \
+                   PNUMFILETYPE VARCHAR(10), \
+                   ORIGFILENAME VARCHAR(200), \
                    HMZS INTEGER, \
                    ZCSL INTEGER, \
                    YCSL INTEGER, \
@@ -201,6 +205,8 @@ bool SNCDataBase::createConnection(QString password, QString path)
                    SETTLEFEE NUMERIC, \
                    GIFTFEE NUMERIC, \
                    MEMO VARCHAR(100), \
+                   ISDELIVER CHAR(1), \
+                   DELIVER_TIME VARCHAR(100), \
                    CACHE_LOCAL_PATH VARCHAR(1000) \
                    )");
     }
@@ -686,12 +692,12 @@ QMap<QString,QStringList> SNCDataBase::getLocalClientConfigs()
 }
 QString SNCDataBase::getAppVersion()
 {
-    return "7.6.3";//±ØÐëÊÇ7.1.0Èý¶Î
+    return "7.7.0";//±ØÐëÊÇ7.1.0Èý¶Î
 }
 
 QString SNCDataBase::getAppVersion2()
 {
-    return "7.6.3";
+    return "7.7.0";
 }
 QString SNCDataBase::getSegVersion()
 {
@@ -2811,11 +2817,7 @@ int SNCDataBase::deleteBzjcFinishExceptSrvIDs(QString clientID, QString userCode
     return 0;
 }
 
-
-
-///////////////////////////////////////////
-
-int SNCDataBase::updateWoolCheckDealInfos(QMultiMap<QString, QString> maps, QString userCode, QString clientID)
+int SNCDataBase::updateWoolCheckDealInfos(QMultiMap<QString, QString> maps, QString userCode)
 {
     QSqlQuery query;
     QSqlDatabase::database().transaction();
@@ -2826,54 +2828,54 @@ int SNCDataBase::updateWoolCheckDealInfos(QMultiMap<QString, QString> maps, QStr
         rows = maps.size()/cols;
     }
     query.clear();
-    query.exec("delete  from  user.bzjc_check_dealing where client_id = '" + clientID+ "'");
+    query.exec("delete from user.wool_check_dealing");
     for(int i=0;i<rows;i++)
     {
-        QString batchid = maps.values("batchid").at(i);
-        QString batchtype = maps.values("batchtype").at(i);
-        QString detail = maps.values("detail").at(i);
-        QString resulttj = maps.values("resulttj").at(i);
-        QString submittime = maps.values("submittime").at(i);
-        QString tftime = maps.values("tftime").at(i);
-        QString vftime = maps.values("vftime").at(i);
-        QString isverify = maps.values("isverify").at(i);
+        QString taskid = maps.values("taskid").at(i);
+        QString pnumfiletype = maps.values("pnumfiletype").at(i);
+        QString origfilename = maps.values("origfilename").at(i);
+        int hmzs = maps.values("hmzs").at(i).toInt();
+        int feecount = maps.values("feecount").at(i).toInt();
+        QString createtime = maps.values("createtime").at(i);
+        QString state = maps.values("state").at(i);
+        QString statestr = maps.values("statestr").at(i);
         QString settlefee = maps.values("settlefee").at(i);
         QString giftfee = maps.values("giftfee").at(i);
-        int numcount = maps.values("numcount").at(i).toInt();
-        int dlcount = maps.values("dlcount").at(i).toInt();
-        int finishcount = maps.values("finishcount").at(i).toInt();
-        QString optstatus = maps.values("optstatus").at(i);
+        QString memo = maps.values("memo").at(i);
 
         query.clear();
-        query.prepare("delete  from  user.file_upload where server_fid = ?");
-        query.addBindValue(batchid);
+        query.prepare("delete from user.file_upload where server_fid = ?");
+        query.addBindValue(taskid);
         query.exec();
 
-        double percent = 0;
-        if(numcount!=0)
-            percent = finishcount * 100.0 / numcount;
         query.clear();
-        query.prepare("insert into user.bzjc_check_dealing( \
-                      BATCH_ID ,BATCH_TYPE ,CLIENT_ID,USER_CODE ,\
-                      DETAIL ,RESULT_TJ ,SUBMIT_TIME,TF_TIME,\
-                      VF_TIME ,ISVERIFY,SETTLE_FEE,GIFT_FEE ,\
-                      NUM_COUNT ,DOWNLOAD_COUNT ,FINISH_COUNT , OPT_STATUS) \
-                      VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+        query.prepare("insert into user.wool_check_dealing( \
+                      TASKID, USERCODE, PNUMFILETYPE, ORIGFILENAME, HMZS, FEE_COUNT, \
+                      CREATE_TIME, STATE, STATESTR, SETTLEFEE, GIFTFEE, MEMO \
+                      ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)");
         QVariantList vars;
-        vars<<batchid<<batchtype<<clientID<<userCode<<detail<<resulttj<<submittime<<tftime<<vftime<<isverify;
-        vars<<settlefee<<giftfee<<numcount<<dlcount<<finishcount<<optstatus;
+        vars << taskid << userCode << pnumfiletype << origfilename << hmzs << feecount;
+        vars << createtime << state << statestr << settlefee << giftfee << memo;
         for(int i=0;i<vars.size();i++)
         {
             query.addBindValue(vars.at(i));
         }
-        query.exec();
+        //query.exec();
+        if (!query.exec()) {
+            qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+                   <<"SNCDataBase::updateWoolCheckDealInfos() return false ";
+        }
+        else {
+            qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+                   <<"SNCDataBase::updateWoolCheckDealInfos() success ";
+        }
     }
 
     QSqlDatabase::database().commit();
     return 0;
 }
 
-int SNCDataBase::updateWoolCheckFinishInfos(QMultiMap<QString, QString> maps, QString userCode, QString clientID)
+int SNCDataBase::updateWoolCheckFinishInfos(QMultiMap<QString, QString> maps, QString userCode)
 {
     QSqlQuery query;
     QSqlDatabase::database().transaction();
@@ -2885,87 +2887,91 @@ int SNCDataBase::updateWoolCheckFinishInfos(QMultiMap<QString, QString> maps, QS
     }
     for(int i=0;i<rows;i++)
     {
-        QString batchid = maps.values("batchid").at(i);
-        QString batchtype = maps.values("batchtype").at(i);
-        QString detail = maps.values("detail").at(i);
-        QString resulttj = maps.values("resulttj").at(i);
-        QString submittime = maps.values("submittime").at(i);
+        QString taskid = maps.values("taskid").at(i);
+        QString pnumfiletype = maps.values("pnumfiletype").at(i);
+        QString origfilename = maps.values("origfilename").at(i);
+        int hmzs = maps.values("hmzs").at(i).toInt();
+        int zcsl = maps.values("zcsl").at(i).toInt();
+        int ycsl = maps.values("ycsl").at(i).toInt();
+        int wzsl = maps.values("wzsl").at(i).toInt();
+        int feecount = maps.values("feecount").at(i).toInt();
+        QString createtime = maps.values("createtime").at(i);
         QString finishtime = maps.values("finishtime").at(i);
+        QString state = maps.values("state").at(i);
+        QString statestr = maps.values("statestr").at(i);
         QString settlefee = maps.values("settlefee").at(i);
         QString giftfee = maps.values("giftfee").at(i);
-        QString numcount = maps.values("numcount").at(i);
-        QString dlcount = maps.values("dlcount").at(i);
-        QString finishcount = maps.values("finishcount").at(i);
-        QString optstatus = maps.values("optstatus").at(i);
-        QString ispass = maps.values("ispass").at(i);
+        QString memo = maps.values("memo").at(i);
         QString isdeliver = maps.values("isdeliver").at(i);
         QString delivertime = maps.values("delivertime").at(i);
 
 //        query.clear();
-//        query.prepare("delete  from  user.file_upload where server_fid = ?");
-//        query.addBindValue(batchid);
+//        query.prepare("delete from user.file_upload where server_fid = ?");
+//        query.addBindValue(taskid);
 //        query.exec();
 
         query.clear();
-        query.prepare("select CACHE_LOCAL_PATH  from  user.bzjc_check_finished where BATCH_ID = ?");
-        query.addBindValue(batchid);
+        query.prepare("select CACHE_LOCAL_PATH from user.wool_check_finished where TASKID = ?");
+        query.addBindValue(taskid);
         query.exec();
-
         if(query.next())
         {
             if(!query.value(0).toString().isEmpty())
                 continue;
         }
+
         query.clear();
-        query.prepare("delete  from  user.bzjc_check_finished where BATCH_ID = ?");
-        query.addBindValue(batchid);
+        query.prepare("delete from user.wool_check_finished where TASKID = ?");
+        query.addBindValue(taskid);
         query.exec();
         query.clear();
-        query.prepare("insert into user.bzjc_check_finished( \
-                      BATCH_ID ,BATCH_TYPE ,CLIENT_ID,USER_CODE ,\
-                      DETAIL ,RESULT_TJ ,SUBMIT_TIME,FINISH_TIME,\
-                      SETTLE_FEE,GIFT_FEE ,\
-                      NUM_COUNT ,DOWNLOAD_COUNT ,FINISH_COUNT , OPT_STATUS,\
-                      ISPASS,ISDELIVER,DELIVER_TIME) \
-                      VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+
+        query.prepare("insert into user.wool_check_finished( \
+                      TASKID, USERCODE, PNUMFILETYPE, ORIGFILENAME, HMZS, ZCSL, YCSL, WZSL, FEE_COUNT, \
+                      CREATE_TIME, FINISH_TIME, STATE, STATESTR, SETTLEFEE, GIFTFEE, MEMO, ISDELIVER, DELIVER_TIME \
+                      ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
         QVariantList vars;
-        vars<<batchid<<batchtype<<clientID<<userCode<<detail<<resulttj<<submittime<<finishtime;
-        vars<<settlefee<<giftfee<<numcount<<dlcount<<finishcount<<optstatus<<ispass<<isdeliver<<delivertime;
+        vars << taskid << userCode << pnumfiletype << origfilename << hmzs << zcsl << ycsl << wzsl << feecount \
+             << createtime << finishtime << state << statestr << settlefee << giftfee << memo << isdeliver << delivertime;
         for(int i=0;i<vars.size();i++)
         {
             query.addBindValue(vars.at(i));
         }
-        query.exec();
+        //query.exec();
+        if (!query.exec()) {
+            qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+                   <<"SNCDataBase::updateWoolCheckFinishInfos() return false ";
+        }
+        else {
+            qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+                   <<"SNCDataBase::updateWoolCheckFinishInfos() success ";
+        }
     }
     QSqlDatabase::database().commit();
     return 0;
 }
 
-QMultiMap<QString, QString> SNCDataBase::getWoolCheckFinishInfos(QString userCode, QString clientID, QString isdeliver)
+QMultiMap<QString, QString> SNCDataBase::getWoolCheckFinishInfos(QString userCode, QString isdeliver)
 {
     QMultiMap<QString ,QString> values;
     QSqlQuery query;
     QVariantList vars;
+
     if(isdeliver.isEmpty())
     {
-        query.prepare("select BATCH_ID ,BATCH_TYPE ,\
-                      DETAIL ,RESULT_TJ ,SUBMIT_TIME,FINISH_TIME,\
-                      SETTLE_FEE,GIFT_FEE ,\
-                      NUM_COUNT ,DOWNLOAD_COUNT ,FINISH_COUNT , OPT_STATUS,\
-                      ISPASS,ISDELIVER,DELIVER_TIME \
-                      from user.bzjc_check_finished where user_code=? and client_id = ? ");
-        vars<<userCode<<clientID;
+        query.prepare("select TASKID, PNUMFILETYPE, ORIGFILENAME, HMZS, ZCSL, YCSL, WZSL, FEE_COUNT, \
+                      CREATE_TIME, FINISH_TIME, STATE, STATESTR, SETTLEFEE, GIFTFEE, MEMO, ISDELIVER, DELIVER_TIME \
+                      from user.wool_check_finished where usercode = ?");
+        vars << userCode;
     }
     else
     {
-        query.prepare("select BATCH_ID ,BATCH_TYPE ,\
-                      DETAIL ,RESULT_TJ ,SUBMIT_TIME,FINISH_TIME,\
-                      SETTLE_FEE,GIFT_FEE ,\
-                      NUM_COUNT ,DOWNLOAD_COUNT ,FINISH_COUNT , OPT_STATUS,\
-                      ISPASS,ISDELIVER,DELIVER_TIME \
-                      from user.bzjc_check_finished where user_code=? and client_id = ?  and isdeliver = ?");
-        vars<<userCode<<clientID<<isdeliver;
+        query.prepare("select TASKID, PNUMFILETYPE, ORIGFILENAME, HMZS, ZCSL, YCSL, WZSL, FEE_COUNT, \
+                      CREATE_TIME, FINISH_TIME, STATE, STATESTR, SETTLEFEE, GIFTFEE, MEMO, ISDELIVER, DELIVER_TIME \
+                      from user.wool_check_finished where usercode = ? and isdeliver = ?");
+        vars << userCode << isdeliver;
     }
+
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -2974,36 +2980,37 @@ QMultiMap<QString, QString> SNCDataBase::getWoolCheckFinishInfos(QString userCod
     while(query.next())
     {
         int i=0;
-        values.insert("batchid",query.value(i++).toString());
-        values.insert("batchtype",query.value(i++).toString());
-        values.insert("detail",query.value(i++).toString());
-        values.insert("resulttj",query.value(i++).toString());
-        values.insert("submittime",query.value(i++).toString());
+        values.insert("taskid",query.value(i++).toString());
+        values.insert("pnumfiletype",query.value(i++).toString());
+        values.insert("origfilename",query.value(i++).toString());
+        values.insert("hmzs",query.value(i++).toString());
+        values.insert("zcsl",query.value(i++).toString());
+        values.insert("ycsl",query.value(i++).toString());
+        values.insert("wzsl",query.value(i++).toString());
+        values.insert("feecount",query.value(i++).toString());
+        values.insert("createtime",query.value(i++).toString());
         values.insert("finishtime",query.value(i++).toString());
+        values.insert("state",query.value(i++).toString());
+        values.insert("statestr",query.value(i++).toString());
         values.insert("settlefee",query.value(i++).toString());
         values.insert("giftfee",query.value(i++).toString());
-        values.insert("numcount",query.value(i++).toString());
-        values.insert("dlcount",query.value(i++).toString());
-        values.insert("finishcount",query.value(i++).toString());
-        values.insert("optstatus",query.value(i++).toString());
-        values.insert("ispass",query.value(i++).toString());
+        values.insert("memo",query.value(i++).toString());
         values.insert("isdeliver",query.value(i++).toString());
         values.insert("delivertime",query.value(i++).toString());
     }
     return values;
 }
 
-QMultiMap<QString, QString> SNCDataBase::getWoolCheckDealingInfos(QString userCode, QString clientID)
+QMultiMap<QString, QString> SNCDataBase::getWoolCheckDealingInfos(QString userCode)
 {
     QMultiMap<QString ,QString> values;
     QSqlQuery query;
     QVariantList vars;
-    query.prepare("select BATCH_ID ,BATCH_TYPE ,\
-                  DETAIL ,RESULT_TJ ,SUBMIT_TIME,\
-                  SETTLE_FEE,GIFT_FEE ,\
-                  NUM_COUNT ,DOWNLOAD_COUNT ,FINISH_COUNT , OPT_STATUS,isverify,tf_time \
-                  from user.BZJC_CHECK_DEALING where user_code=? and client_id = ? ");
-    vars<<userCode<<clientID;
+    query.prepare("select TASKID, PNUMFILETYPE, ORIGFILENAME, HMZS, FEE_COUNT, \
+                  CREATE_TIME, STATE, STATESTR, SETTLEFEE, GIFTFEE, MEMO \
+                  from user.wool_check_dealing where usercode = ?");
+    vars << userCode;
+
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -3012,29 +3019,28 @@ QMultiMap<QString, QString> SNCDataBase::getWoolCheckDealingInfos(QString userCo
     while(query.next())
     {
         int i=0;
-        values.insert("batchid",query.value(i++).toString());
-        values.insert("batchtype",query.value(i++).toString());
-        values.insert("detail",query.value(i++).toString());
-        values.insert("resulttj",query.value(i++).toString());
-        values.insert("submittime",query.value(i++).toString());
+        values.insert("taskid",query.value(i++).toString());
+        values.insert("pnumfiletype",query.value(i++).toString());
+        values.insert("origfilename",query.value(i++).toString());
+        values.insert("hmzs",query.value(i++).toString());
+        values.insert("feecount",query.value(i++).toString());
+        values.insert("createtime",query.value(i++).toString());
+        values.insert("state",query.value(i++).toString());
+        values.insert("statestr",query.value(i++).toString());
         values.insert("settlefee",query.value(i++).toString());
         values.insert("giftfee",query.value(i++).toString());
-        values.insert("numcount",query.value(i++).toString());
-        values.insert("dlcount",query.value(i++).toString());
-        values.insert("finishcount",query.value(i++).toString());
-        values.insert("optstatus",query.value(i++).toString());
-        values.insert("isverify",query.value(i++).toString());
-        values.insert("tftime",query.value(i++).toString());
+        values.insert("memo",query.value(i++).toString());
     }
     return values;
 }
 
-int SNCDataBase::getWoolToDown(QString userCode, QString clientID)
+int SNCDataBase::getWoolToDown(QString userCode)
 {
     QSqlQuery query;
-    query.prepare("select count(*) from user.bzjc_check_finished where user_code=?  and client_id = ? and isdeliver='0'");
+    query.prepare("select count(*) from user.wool_check_finished where usercode = ?");
     QVariantList vars;
-    vars<<userCode<<clientID;
+    vars << userCode;
+
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -3052,9 +3058,10 @@ int SNCDataBase::delWoolByID(QString srvID)
 {
     QSqlDatabase::database().transaction();
     QSqlQuery query;
-    query.prepare("delete from user.BZJC_CHECK_FINISHED  where batch_ID=? ");
+    query.prepare("delete from user.wool_check_finished where TASKID = ?");
     QVariantList vars;
-    vars<<srvID;
+    vars << srvID;
+
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -3069,9 +3076,10 @@ int SNCDataBase::updateWoolCachePath(QString srvID, QString cachePath)
 {
     QSqlDatabase::database().transaction();
     QSqlQuery query;
-    query.prepare("update user.BZJC_CHECK_FINISHED set CACHE_LOCAL_PATH = ?,ISDELIVER='1'  where batch_ID=? ");
+    query.prepare("update user.wool_check_finished set CACHE_LOCAL_PATH = ?, ISDELIVER='1' where TASKID = ?");
     QVariantList vars;
-    vars<<cachePath<<srvID;
+    vars << cachePath << srvID;
+
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -3085,9 +3093,9 @@ int SNCDataBase::updateWoolCachePath(QString srvID, QString cachePath)
 QString SNCDataBase::getWoolCachePath(QString srvID)
 {
     QSqlQuery query;
-    query.prepare("select CACHE_LOCAL_PATH from user.BZJC_CHECK_FINISHED where batch_ID=? ");
+    query.prepare("select CACHE_LOCAL_PATH from user.wool_check_finished where TASKID = ?");
     QVariantList vars;
-    vars<<srvID;
+    vars << srvID;
     for(int i=0;i<vars.size();i++)
     {
         query.addBindValue(vars.at(i));
@@ -3101,7 +3109,7 @@ QString SNCDataBase::getWoolCachePath(QString srvID)
     return value;
 }
 
-int SNCDataBase::deleteWoolFinishExceptSrvIDs(QString clientID, QString userCode, QStringList ids)
+int SNCDataBase::deleteWoolFinishExceptSrvIDs(QString userCode, QStringList ids)
 {
     QString where;
     for(int i=0;i<ids.size();i++)
@@ -3113,27 +3121,23 @@ int SNCDataBase::deleteWoolFinishExceptSrvIDs(QString clientID, QString userCode
     }
     if(where.isEmpty())
     {
-        where = " where client_id = ? and user_code = ?  ";
+        where = " where usercode = ? ";
     }
     else
     {
-        where = " where client_id = ? and user_code = ?  and \
-                BATCH_ID not in (" + where + ")";
+        where = " where usercode = ? and \
+                TASKID not in (" + where + ")";
     }
 
-    QString sql = " delete from BZJC_CHECK_FINISHED " + where;
+    QString sql = "delete from wool_check_finished " + where;
     QSqlQuery query;
     QSqlDatabase::database().transaction();
     query.prepare(sql);
-    query.addBindValue(clientID);
     query.addBindValue(userCode);
     query.exec();
     QSqlDatabase::database().commit();
     return 0;
 }
-///////////////////////////////////////////
-
-
 
 QMultiMap<QString, QString> SNCDataBase::getSegRecInfos()
 {

sncprojects/lib/SNCDataBase/sncdatabase.h

@@ -160,15 +160,15 @@ public:
     static int deleteBzjcFinishExceptSrvIDs(QString clientID,QString userCode,QStringList ids);
 
     //防薅羊毛检测模块所需要的数据库访问接口
-    static int updateWoolCheckDealInfos(QMultiMap<QString,QString> maps,QString userCode,QString clientID);
-    static int updateWoolCheckFinishInfos(QMultiMap<QString,QString> maps,QString userCode,QString clientID);
-    static QMultiMap<QString,QString> getWoolCheckFinishInfos(QString userCode,QString clientID,QString isdeliver);
-    static QMultiMap<QString,QString> getWoolCheckDealingInfos(QString userCode,QString clientID);
-    static int getWoolToDown(QString userCode,QString clientID);
+    static int updateWoolCheckDealInfos(QMultiMap<QString,QString> maps, QString userCode);
+    static int updateWoolCheckFinishInfos(QMultiMap<QString,QString> maps, QString userCode);
+    static QMultiMap<QString,QString> getWoolCheckFinishInfos(QString userCode, QString isdeliver);
+    static QMultiMap<QString,QString> getWoolCheckDealingInfos(QString userCode);
+    static int getWoolToDown(QString userCode);
     static int delWoolByID(QString srvID);
     static int updateWoolCachePath(QString srvID,QString cachePath);
     static QString getWoolCachePath(QString srvID);
-    static int deleteWoolFinishExceptSrvIDs(QString clientID,QString userCode,QStringList ids);
+    static int deleteWoolFinishExceptSrvIDs(QString userCode,QStringList ids);
 
     //号码推荐获取检测接口
     static QMultiMap<QString,QString> getSegRecInfos();

sncprojects/lib/SNCMain/mainwindow.cpp

@@ -116,6 +116,8 @@ void MainWindow::initVariables()
     connect(m_dialogUpdate,SIGNAL(segNewVersionFound()),m_formMINGYUAN,SLOT(onSyncPause()));
     connect(m_dialogUpdate,SIGNAL(segUpdated()),m_formRiddle,SLOT(onSyncResume()));
     connect(m_dialogUpdate,SIGNAL(segNewVersionFound()),m_formRiddle,SLOT(onSyncPause()));
+    connect(m_dialogUpdate,SIGNAL(segUpdated()),m_formWool,SLOT(onSyncResume()));
+    connect(m_dialogUpdate,SIGNAL(segNewVersionFound()),m_formWool,SLOT(onSyncPause()));
 
     m_autoLogin = new AutoLogin();
 

sncprojects/lib/SNCMain/sncmain.pro

@@ -14,6 +14,7 @@ INCLUDEPATH +=../SNCCore
 INCLUDEPATH +=../wsnumchk
 INCLUDEPATH +=../wssso
 INCLUDEPATH +=../wscube
+INCLUDEPATH +=../WSWOOL
 INCLUDEPATH +=../sncuser
 INCLUDEPATH +=../SNCCube
 INCLUDEPATH +=../SNCNumCheck
@@ -33,7 +34,9 @@ LIBS += ../../output/sncdatabase.dll\
         ../../output/sncuser.dll\
         ../../output/wssso.dll\
         ../../output/wscube.dll\
-        ../../output/snczip.dll
+        ../../output/snczip.dll \
+        ../../output/wswool.dll
+
 SOURCES += sncmain.cpp \
     dialogupdateseg.cpp \
     dialogabout.cpp \

sncprojects/lib/SNCWool/autosyncdata.cpp

@@ -1,6 +1,6 @@
 #include "autosyncdata.h"
-#include "respgetfinishedinfo.h"
-#include "respgetdealinfo.h"
+#include "respgetfhymht.h"
+#include "respgetfhymtask.h"
 #include "sncdatabase.h"
 
 AutoSyncData::AutoSyncData()
@@ -60,13 +60,14 @@ void AutoSyncData::setAccountInfo(QMap<QString, QString> accountInfo)
 
 void AutoSyncData::sync()
 {
-    QString userHash = m_account.value("userhash");
+    QString userHash = m_account.value("ssohash");
     QString userCode = m_account.value("usercode");
-    if(userHash.isEmpty() || m_clientID.isEmpty() || userCode.isEmpty())
+    if(userHash.isEmpty() || userCode.isEmpty())
         return ;
 
     if(!checkSynCondition())
         return;
+
     bool isSync1 = false;
     bool isSync2 = false;
     QString json = m_wool->GetfhymTask(userHash);
@@ -79,33 +80,32 @@ void AutoSyncData::sync()
 //    QTextStream in(&file);
 //    json = in.readAll();
     //qDebug()<<"json:"<<json;
-    RespGetDealInfo response(json);
+    RespGetFhymTask response(json);
     if(response.getRtnCode()>=0)
     {
-        SNCDataBase::updateBzjcCheckDealInfos(response.getRs(),userCode,m_clientID);
+        SNCDataBase::updateWoolCheckDealInfos(response.getRs(), userCode);
         isSync1 = true;
     }
     if(m_stop)
         return;
 
     int indate = 3;
-    json = m_wool->GetfhymHt(indate,userHash);
+    json = m_wool->GetfhymHt(indate, userHash);
 
-    RespGetFinishedInfo response2(json);
+    RespGetFhymHt response2(json);
     if(response2.getRtnCode()>=0)
     {
-        QStringList srvids = response2.getRs().values("batchid");
-        SNCDataBase::deleteBzjcFinishExceptSrvIDs(m_clientID,userCode,srvids);
-        SNCDataBase::updateBzjcCheckFinishInfos(response2.getRs(),userCode,m_clientID);
+        QStringList srvids = response2.getRs().values("taskid");
+        SNCDataBase::deleteWoolFinishExceptSrvIDs(userCode, srvids);
+        SNCDataBase::updateWoolCheckFinishInfos(response2.getRs(), userCode);
         isSync2 = true;
     }
 
-
-    if(isSync1||isSync2)
+    if(isSync1 || isSync2)
     {
         //QStringList srvids = response.getRs().values("batchid");
         //srvids.append(response2.getRs().values("batchid"));
-        //SNCDataBase::updateFileUploadOutdateDataBySrvIDs("bzjc",m_clientID,userCode,srvids);
+        //SNCDataBase::updateFileUploadOutdateDataBySrvIDs("Wool",m_clientID,userCode,srvids);
         emit dataSync();
     }
 }
@@ -114,20 +114,21 @@ bool AutoSyncData::checkSynCondition()
 {
     //从服务器同步的条件
     //1、用户每次登陆时
-    //2、bzjc_check_dealing表里有数据
-    //3、bzjc_check_finished表，ispass = 0;
+    //2、Wool_check_dealing表里有数据
+    //3、Wool_check_finished表，ispass = 0;
     //4、upload表里，有upload_state = 3;
     if(m_first)
     {
         m_first = false;
         return true;
     }
-    QString userHash = m_account.value("userhash");
+
+    QString userHash = m_account.value("ssohash");
     QString userCode = m_account.value("usercode");
-    if(userHash.isEmpty() || m_clientID.isEmpty() || userCode.isEmpty())
+    if(userHash.isEmpty() || userCode.isEmpty())
         return false ;
 
-    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload(m_moduleID,m_clientID,userCode);
+    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload(m_moduleID,"",userCode);
     int cols = list.uniqueKeys().size();
     int rows = 0;
     if(cols!=0)
@@ -141,13 +142,14 @@ bool AutoSyncData::checkSynCondition()
         }
     }
 
-    list = SNCDataBase::getBzjcCheckDealingInfos(userCode,m_clientID);
+    list = SNCDataBase::getWoolCheckDealingInfos(userCode);
     if(list.size()>0)
     {
         return true;
     }
 
-    list = SNCDataBase::getBzjcCheckFinishInfos(userCode,m_clientID,"");
+    /*
+    list = SNCDataBase::getWoolCheckFinishInfos(userCode,"");
 
     cols = list.uniqueKeys().size();
     rows = 0;
@@ -161,5 +163,8 @@ bool AutoSyncData::checkSynCondition()
             return true;
         }
     }
+    */
+    qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+           <<"AutoSyncData::checkSynCondition() return false ";
     return false;
 }

sncprojects/lib/SNCWool/autouploadfile.cpp

@@ -1,9 +1,9 @@
 #include "autouploadfile.h"
 #include "sncdatabase.h"
 #include "wswool.h"
-#include "respsubminpnum.h"
+#include "respsubmitfhymfile.h"
 #include "resppackmerge.h"
-#include "respchkuserfeestatus.h"
+#include "respuserserviceverify.h"
 #include "resppacktran.h"
 #include "fileprepare.h"
 #include "filesplitter.h"
@@ -32,7 +32,6 @@ void AutoUploadFile::abort()
 
 void AutoUploadFile::setSkip(bool skip)
 {
-
     m_skip = skip;
 }
 
@@ -60,9 +59,9 @@ void AutoUploadFile::run()
     m_stop = false;
     QString userCode = m_account.value("usercode");
     QString userHash = m_account.value("ssohash");
-    if(userHash.isEmpty()||userCode.isEmpty()||m_clientID.isEmpty())
+    if(userHash.isEmpty() || userCode.isEmpty())
         return ;
-    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload(m_moduleID,m_clientID,userCode);
+    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload(m_moduleID,"",userCode);
     int cols = list.uniqueKeys().size();
     int rows = 0;
     if(cols!=0)
@@ -100,15 +99,13 @@ void AutoUploadFile::run()
                     break;
             }
         }
-
     }
 }
 
-int AutoUploadFile::upload(int fileid,QString filePath, QString fileType,QString taskType, QString memo)
+int AutoUploadFile::upload(int fileid, QString filePath, QString fileType, QString taskType, QString memo)
 {
-
     bool multi;
-    if(taskType=="1")
+    if(taskType == "1")
         multi = false;
     else
         multi = true;
@@ -126,7 +123,7 @@ int AutoUploadFile::upload(int fileid,QString filePath, QString fileType,QString
     QString userHash = m_account.value("ssohash");
     QString funcName = "SubmitfhymFile";
     QString json = m_wool->UserServiceVerify(funcName, QString("%1").arg(filePrepare.getCount()), userHash);
-    RespChkUserFeeStatus    response(json);
+    RespUserServiceVerify response(json);
     if(response.getRtnCode()<=0)
     {
         m_errMsg = response.getRtnMemo();
@@ -153,7 +150,7 @@ int AutoUploadFile::upload(int fileid,QString filePath, QString fileType,QString
             return 0;
         }
         packName = list.at(i);
-        QString json = m_wool->PackTran(packName,userHash);
+        QString json = m_wool->PackTran(packName, userHash);
         RespPackTran response(json);
         if(response.getRtnCode()==1)
         {
@@ -182,25 +179,25 @@ int AutoUploadFile::upload(int fileid,QString filePath, QString fileType,QString
     if(allupload)
     {
         splitter.cleanup();
-        QString json = m_wool->PackMerge(packName,userHash);
+        QString json = m_wool->PackMerge(packName, userHash);
         RespPackMerge response(json);
         if(response.getRtnCode()==1)
         {
             json = m_wool->SubmitfhymFile(filePrepare.getLastUploadFileName(), response.getFileHash(), fileType, memo, userHash);
-            RespSubminPNum response(json);
+            RespSubmitFhymFile response(json);
             if(response.getRtnCode()==2)
             {
                 m_errCode = 1;
                 m_errMsg = "上传成功，号码全部接收。";
                 m_errDetail = response.getRtnMemo();
-                SNCDataBase::updateFileUploadSrvInfo(fileid,response.getBatchID(),response.getSubmitTime());
+                SNCDataBase::updateFileUploadSrvInfo(fileid,response.getTaskID(),response.getSubmitTime());
             }
             else if(response.getRtnCode()==1)
             {
                 m_errCode = 1;
                 m_errMsg = "上传成功，文件中含有部分非法数据。";
                 m_errDetail = response.getRtnMemo();
-                SNCDataBase::updateFileUploadSrvInfo(fileid,response.getBatchID(),response.getSubmitTime());
+                SNCDataBase::updateFileUploadSrvInfo(fileid,response.getTaskID(),response.getSubmitTime());
             }
             else
             {

sncprojects/lib/SNCWool/autouploadfile.h

@@ -13,7 +13,7 @@ public:
     void abort();
     void setSkip(bool skip);
     void setClientID(QString clientID);
-    void setHost(QString host,QString port);
+    void setHost(QString host, QString port);
 public slots:
     void setAccountInfo(QMap<QString,QString> accountInfo);
 signals:
@@ -23,7 +23,7 @@ signals:
 protected:
     void run();
 private:
-    int upload(int fileid,QString filePath,QString fileType,QString taskType,QString memo);
+    int upload(int fileid,QString filePath, QString fileType, QString taskType, QString memo);
 private:
     QMap<QString,QString> m_account;
     QString m_clientID;

sncprojects/lib/SNCWool/dialogsubmit.cpp

@@ -18,17 +18,17 @@ void DialogSubmit::setUserCode(QString userCode)
     m_formUpload->setUserCode(userCode);
 }
 
-void DialogSubmit::setClientID(QString clientID)
-{
-    m_formUpload->setClientID(clientID);
-}
+//void DialogSubmit::setClientID(QString clientID)
+//{
+//    m_formUpload->setClientID(clientID);
+//}
 
 DialogSubmit::~DialogSubmit()
 {
     delete ui;
     delete m_formUpload;
     qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
-           <<"FormNumcheck.DialogSubmit Destroyed.";
+           <<"FormWool.DialogSubmit Destroyed.";
 }
 
 void DialogSubmit::closeEvent(QCloseEvent *event)

sncprojects/lib/SNCWool/dialogsubmit.h

@@ -14,7 +14,7 @@ class DialogSubmit : public QDialog
 public:
     explicit DialogSubmit(QWidget *parent = 0);
     void setUserCode(QString userCode);
-    void setClientID(QString clientID);
+//    void setClientID(QString clientID);
     ~DialogSubmit();
     void closeEvent(QCloseEvent *event);
 signals:

sncprojects/lib/SNCWool/formupload.cpp

@@ -22,7 +22,7 @@ FormUpload::~FormUpload()
 {
     delete ui;
     qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
-           <<"FormNumchk.FormUpload Destroyed.";
+           <<"FormWool.FormUpload Destroyed.";
 }
 
 void FormUpload::resetUI()
@@ -37,10 +37,10 @@ void FormUpload::setUserCode(QString userCode)
     m_userCode = userCode;
 }
 
-void FormUpload::setClientID(QString clientID)
-{
-    m_clientID = clientID;
-}
+//void FormUpload::setClientID(QString clientID)
+//{
+//    m_clientID = clientID;
+//}
 
 void FormUpload::on_pushButtonOpen_clicked()
 {
@@ -77,9 +77,9 @@ void FormUpload::on_pushButtonSubmit_clicked()
         fileType = "1";
     if(ui->radioButtonSeg->isChecked())
         fileType = "2";
-    if(this->ui->checkBoxMultiTask->isChecked())
-        taskType = "2";
-    else
+//    if(this->ui->checkBoxMultiTask->isChecked())
+//        taskType = "2";
+//    else
         taskType = "1";
     if(!prepareAddFile(filePath,fileType,taskType,memo))
         return ;
@@ -93,7 +93,7 @@ bool FormUpload::prepareAddFile(QString filePath,QString fileType,QString taskTy
     QString suffix = fileInfo.suffix();
     int size = fileInfo.size()/1024/1024;
     QStringList cacheFiles;
-    if(taskType=="1")//如果是单任务
+    if(taskType == "1")//如果是单任务
     {
         cacheFiles << filePath;
     }
@@ -119,12 +119,14 @@ bool FormUpload::prepareAddFile(QString filePath,QString fileType,QString taskTy
                 cacheFiles = createCacheFilesByUnzip(filePath);
             }
         }
+
+        if(cacheFiles.size()==0)
+        {
+            QMessageBox::critical(this,"提示","您选择多任务模式，但无法对文件进行拆分，请检查文件格式是否有效",QMessageBox::Ok);
+            return false;
+        }
     }
-    if(cacheFiles.size()==0)
-    {
-        QMessageBox::critical(this,"提示","您选择多任务模式，但无法对文件进行拆分，请检查文件格式是否有效",QMessageBox::Ok);
-        return false;
-    }
+
     addUploadFile(cacheFiles,memo,fileType);
     return true;
 }
@@ -134,7 +136,7 @@ QString FormUpload::prepareTempDir()
     QString userCode = m_userCode;
     QString timeStamp = QDateTime::currentDateTime().toString("yyyyMMddhhmmss");
     QString cachePath = QCoreApplication::applicationDirPath()+\
-            QString("/../data/%1/cache/bzjc/upload/%2/").arg(userCode).arg(timeStamp);
+            QString("/../data/%1/cache/wool/upload/%2/").arg(userCode).arg(timeStamp);
     QDir dir;
     dir.mkpath(cachePath);
     return cachePath;
@@ -236,7 +238,7 @@ void FormUpload::addUploadFile(QStringList filePaths, QString memo, QString file
         QString filePath = filePaths.at(i);
         QFileInfo fileInfo(filePath);
         QString fileName = fileInfo.fileName();
-        SNCDataBase::addFileUpload("bzjc",m_clientID,m_userCode,fileName,filePath,fileType,"1",memo);
+        SNCDataBase::addFileUpload("wool","",m_userCode,fileName,filePath,fileType,"1",memo);
     }
 }
 

sncprojects/lib/SNCWool/formupload.h

@@ -13,7 +13,7 @@ class FormUpload : public QWidget
 public:
     explicit FormUpload(QWidget *parent = 0);
     void setUserCode(QString userCode);
-    void setClientID(QString clientID);
+//    void setClientID(QString clientID);
     ~FormUpload();
 signals:
     void dataUpdated();

sncprojects/lib/SNCWool/formupload.ui

@@ -112,16 +112,6 @@
           </property>
          </spacer>
         </item>
-        <item>
-         <widget class="QCheckBox" name="checkBoxMultiTask">
-          <property name="text">
-           <string>启用多任务模式</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
       <item>
@@ -133,16 +123,6 @@
         </layout>
        </widget>
       </item>
-      <item>
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>注：多任务模式是指当文件为“号段文件”，或者是“号码文件”（必须是压缩包格式）被拆分成多个文件进行处理。</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item>
        <spacer name="verticalSpacer">
         <property name="orientation">

sncprojects/lib/SNCWool/formwool.cpp

@@ -40,16 +40,12 @@ void FormWool::initVariables()
 
     m_timerTask = new QTimer();
 //    m_timerHeartBeat = new QTimer();
-
 //    m_login = new AutoLogin();
-
     m_upload = new AutoUploadFile();
     m_sync = new AutoSyncData();
     m_formDealing = new FormWoolDealing();
-
     m_formAd = new FormAd();
     m_formAccount = new FormAccountInfo();
-
     m_formFinished = new FormWoolFinished();
     m_formFee = new FormWoolFee();
     m_formCharge = new FormWoolCharge();
@@ -123,6 +119,13 @@ void FormWool::setAccountInfo(QMap<QString, QString> info)
         m_formFee->setAccountInfo(info);
 
 //        m_heartbeat->setAccountInfo(info);
+
+        if(!m_timerTask->isActive())
+        {
+            int interval = 5;
+            m_timerTask->start(interval*1000);
+        }
+
     }
     else
     {/*
@@ -197,12 +200,15 @@ void FormWool::onLoginFinished(QMap<QString, QString> info)
 
 void FormWool::onTimeOutTask()
 {
+    qDebug()<<"FormWool::onTimeOutTask start";
     if(!m_upload->isRunning())
     {
+        qDebug()<<"FormWool::onTimeOutTask m_upload->start()";
         m_upload->start();
     }
     if(!m_sync->isRunning())
     {
+        qDebug()<<"FormWool::onTimeOutTask m_sync->start()";
         m_sync->start();
     }
 }

sncprojects/lib/SNCWool/formwool.ui

@@ -6,14 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>612</width>
+    <height>385</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="spacing">
+    <number>9</number>
+   </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayoutBody">
      <property name="spacing">

sncprojects/lib/SNCWool/formwoolcharge.cpp

@@ -41,7 +41,7 @@ void FormWoolCharge::setAccountInfo(QMap<QString, QString> info)
     m_account = info;
     QString ssoHash = info.value("ssohash");
     QString userCode = info.value("usercode");
-    QString userHash = info.value("userhash");
+    QString userHash = info.value("ssohash");
     if(!ssoHash.isEmpty())
     {
         if(!userHash.isEmpty())
@@ -192,7 +192,7 @@ void FormWoolCharge::query()
 {
     QString dateStart = ui->dateEditStart->text();
     QString dateEnd = ui->dateEditEnd->text();
-    QString userHash = m_account.value("userhash");
+    QString userHash = m_account.value("ssohash");
     QString json = m_wool->GetChargeInfo(dateStart, dateEnd, userHash);
     QMultiMap<QString,QString> list;
     RespGetChargeInfo response(json);
@@ -290,13 +290,11 @@ void FormWoolCharge::showRtnMessage(int row)
     }
 }
 
-
-
-
 void FormWoolCharge::onDataUpdated()
 {
     query();
 }
+
 bool FormWoolCharge::chkAccountState(AccountLoginState state)
 {
 
@@ -317,6 +315,7 @@ bool FormWoolCharge::chkAccountState(AccountLoginState state)
     }
     return ret;
 }
+
 void FormWoolCharge::on_pushButtonQuery_clicked()
 {
     if(!chkAccountState(m_state))
@@ -333,6 +332,7 @@ void FormWoolCharge::on_pushButtonQuery_clicked()
     ui->labelState->setText("");
     ui->pushButtonQuery->setEnabled(true);
 }
+
 bool FormWoolCharge::checkLastClickTime(QObject *button)
 {
     QPushButton *btn = qobject_cast<QPushButton*>(button);

sncprojects/lib/SNCWool/formwooldealing.cpp

@@ -34,10 +34,10 @@ void FormWoolDealing::initVariables()
     m_movieBig->start();
     m_blanceOut = false;
     m_state = NotLogin;
-    m_keys<<"optstatus"<<"batchid"<<"detail"<<"submittime"<<"numcount"<<"dlcount"<<"isverify"<<"tftime"<<"finishcount";
 
-    m_headers<<"状态"<<"任务单号"<<"详情"<<"提交时间"<<"号码总数"<<"已检测"<<"是否审核"<<"交付时间"<<"检测进度";
+    m_keys << "state" << "taskid" << "pnumfiletype" << "origfilename" <<"createtime" << "hmzs" << "feecount" << "settlefee" << "giftfee";
 
+    m_headers << "状态" << "任务单号" << "文件类型" << "原始文件" << "提交时间" << "号码总数" << "计费条数" << "检测费用" << "赠送消耗";
 }
 
 void FormWoolDealing::setAccountInfo(QMap<QString, QString> info)
@@ -45,7 +45,7 @@ void FormWoolDealing::setAccountInfo(QMap<QString, QString> info)
     m_account = info;
     QString ssoHash = info.value("ssohash");
     QString userCode = info.value("usercode");
-    QString userHash = info.value("userhash");
+    QString userHash = info.value("ssohash");
     if(!ssoHash.isEmpty())
     {
         if(!userHash.isEmpty())
@@ -105,16 +105,16 @@ void FormWoolDealing::initUI()
     ui->tableWidget->setSortingEnabled(true);
 
     ui->tableWidget->setColumnWidth(0,30);
-    ui->tableWidget->setColumnWidth(1,135);
-    ui->tableWidget->setColumnWidth(2,0);//
-    ui->tableWidget->setColumnWidth(3,130);
+    ui->tableWidget->setColumnWidth(1,0);
+    ui->tableWidget->setColumnWidth(2,66);
+    ui->tableWidget->setColumnWidth(3,170);
     ui->tableWidget->setColumnWidth(4,130);
-    ui->tableWidget->setColumnWidth(5,79);//
-    ui->tableWidget->setColumnWidth(6,0);
-    ui->tableWidget->setColumnWidth(7,0);
-    ui->tableWidget->setColumnWidth(8,170);
+    ui->tableWidget->setColumnWidth(5,79);
+    ui->tableWidget->setColumnWidth(6,79);
+    ui->tableWidget->setColumnWidth(7,60);
+    ui->tableWidget->setColumnWidth(8,60);
 
-    m_headers<<"状态"<<"任务单号"<<"详情"<<"提交时间"<<"号码总数"<<"已检测"<<"是否审核"<<"交付时间"<<"检测进度";
+//    m_headers << "状态" << "任务单号" << "文件类型" << "原始文件" << "提交时间" << "号码总数" << "计费条数" << "检测费用" << "消耗赠送";
 }
 
 void FormWoolDealing::setTableWidgetNoData(QTableWidget *tableWidget)
@@ -123,7 +123,7 @@ void FormWoolDealing::setTableWidgetNoData(QTableWidget *tableWidget)
     tableWidget->setEnabled(false);
     QTableWidgetItem *item = new QTableWidgetItem();
     item->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
-    item->setText("   暂无信息");
+    item->setText("          暂无信息");
     tableWidget->setItem(5,4,item);
 }
 
@@ -162,11 +162,8 @@ void FormWoolDealing::fillDataList(QTableWidget *tableWidget,QStringList keys,
         for(int col=0;col<keys.size();col++)
         {
             QString key = keys.at(col);
-
             QString value = list.values(key).at(row);
-
             map.insert(key,value);
-
         }
         for(int col=0;col<keys.size();col++)
         {
@@ -187,33 +184,47 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
     QVariant display = value;
     QVariant tooltip = value;
     item->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+
     //进行数据翻译
-    if(key=="batchid")
+    if(key=="taskid")
     {
         QString detail = data.value("detail");
         tooltip =  detail;
     }
-    else if(key=="numcount")
+    else if(key == "pnumfiletype")
     {
-        display = data.value("numcount").toInt();
-        tooltip =  data.value("numcount");
+        if(value=="1")
+            display = "号码文件";
+        else if(value=="2")
+            display = "号段文件";
+        else
+            display = "未知";
+        tooltip = display;
     }
-    else if(key=="dlcount")
+    else if(key=="hmzs")
+    {
+        display = data.value("hmzs").toInt();
+        tooltip = data.value("hmzs");
+    }    
+    else if(key=="feecount")
     {
-        display = data.value("finishcount").toInt();
-        tooltip =  data.value("finishcount");
+        display = data.value("feecount").toInt();
+        tooltip = data.value("feecount");
     }
+
     //设置单元格显示形式,是用item填充还是widget填充
-    if(key=="optstatus")
+    if(key=="state")
     {
         delete item;
         QLabel *lbl = new QLabel();
         lbl->setAlignment(Qt::AlignCenter|Qt::AlignHCenter);
-        QString optstatus = data.value("optstatus");
-        QString isverify = data.value("isverify");
-        QString tftime = data.value("tftime");
+        QString state = data.value("state");
+//        QString statestr = data.value("statestr");
+//        QString isverify = data.value("isverify");
+//        QString tftime = data.value("tftime");
+        QString isverify = "1";   //默认审核通过
         if(isverify == "0")
-        {
+        {/*
             if(tftime.isEmpty())
             {
 
@@ -240,7 +251,7 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
             {
                 lbl->setToolTip("服务端已经删除或失效");
                 lbl->setPixmap(QPixmap(":/task_error.png"));
-            }
+            }*/
         }
         else if(isverify == "2")
         {
@@ -249,32 +260,47 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
         }
         else // if(isverify == "1")
         {
-            if(optstatus == "-1")
+            if(state == "-1")
             {
                 lbl->setToolTip("文件已经失效");
                 lbl->setPixmap(QPixmap(":/task_warning.png"));
             }
-            else if(optstatus == "0")
+            else if(state == "0")
             {
-                lbl->setToolTip("停止");
-                //lbl->setPixmap(QPixmap(":/task_stop.png"));
+                lbl->setToolTip("未提交");
+                lbl->setPixmap(QPixmap(":/task_stop.png"));
             }
-            else if(optstatus == "1")
+            else if(state == "1")
             {
-                lbl->setToolTip("暂停");
+                lbl->setToolTip("提交中");
                 lbl->setPixmap(QPixmap(":/task_pause.png"));
             }
-            else if(optstatus == "2")
+            else if(state == "2")
             {
-                lbl->setToolTip("正在检测");
-                lbl->setPixmap(QPixmap(":/task_play.png"));
+                lbl->setToolTip("提交完毕");
+                lbl->setPixmap(QPixmap(":/task_pause.png"));
             }
-            else if(optstatus == "3")
+            else if(state == "3")
+            {
+                lbl->setToolTip("待检测");
+                lbl->setPixmap(QPixmap(":/task_pause.png"));
+            }            
+            else if(state == "4")
             {
-                lbl->setToolTip("正在处理");
+                lbl->setToolTip("检测中");
                 lbl->setPixmap(QPixmap(":/task_play.png"));
             }
-            else if(optstatus == "4" || optstatus == "5" || optstatus == "6")
+            else if(state == "5")
+            {
+                lbl->setToolTip("检测完毕");
+                lbl->setPixmap(QPixmap(":/task_ok.png"));
+            }
+            else if(state == "98")
+            {
+                lbl->setToolTip("任务已删除");
+                lbl->setPixmap(QPixmap(":/task_warning.png"));
+            }
+            else if(state == "99")
             {
                 lbl->setToolTip("发生错误");
                 lbl->setPixmap(QPixmap(":/task_error.png"));
@@ -287,7 +313,7 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
         }
 
         tableWidget->setCellWidget(row,col,lbl);
-    }
+    }/*
     else if(key=="finishcount")
     {
         delete item;
@@ -382,7 +408,7 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
             progress->setProgress(3,percent);
             tableWidget->setCellWidget(row,col,progress);
         }
-    }
+    }*/
     else
     {
         item->setData(Qt::DisplayRole,display);
@@ -395,7 +421,7 @@ void FormWoolDealing::setCellElement(QTableWidget *tableWidget, int row, int col
 void FormWoolDealing::query()
 {
     QString userCode = m_account.value("usercode");
-    QMultiMap<QString,QString> list = SNCDataBase::getWoolCheckDealingInfos(userCode,m_clientID);
+    QMultiMap<QString,QString> list = SNCDataBase::getWoolCheckDealingInfos(userCode);
     int cols = list.uniqueKeys().size();
     int rows = 0;
     if(cols!=0)
@@ -510,7 +536,6 @@ void FormWoolDealing::on_tableWidget_cellDoubleClicked(int row, int column)
 
 bool FormWoolDealing::chkAccountState(AccountLoginState state)
 {
-
     bool ret = false;
     switch(state)
     {

sncprojects/lib/SNCWool/formwoolfee.cpp

@@ -33,17 +33,17 @@ void FormWoolFee::initVariables()
     m_movie->start();
     m_wool = new WSWool();
 
-    m_keys<<"batchid"<<"usercode"<<"submittime"<<"finishtime"<<"numcount"\
-            <<"finishcount"<<"price"<<"settlefee"<<"giftfee";
+    m_keys<<"taskid"<<"origfilename"<<"createtime"<<"finishtime"\
+            <<"feecount"<<"price"<<"settlefee"<<"giftfee";
 
-    m_headers<<"编号"<<"所属用户"<<"提交时间"<<"完成时间"<<"提交数"<<"已检测"<<"单价"<<"费用"<<"赠送消耗";
+    m_headers<<"编号"<<"原始文件"<<"提交时间"<<"完成时间"<<"计费条数"<<"单价"<<"费用"<<"赠送消耗";
 }
 void FormWoolFee::setAccountInfo(QMap<QString, QString> info)
 {
     m_account = info;
     QString ssoHash = info.value("ssohash");
     QString userCode = info.value("usercode");
-    QString userHash = info.value("userhash");
+    QString userHash = info.value("ssohash");
     if(!ssoHash.isEmpty())
     {
         if(!userHash.isEmpty())
@@ -109,14 +109,15 @@ void FormWoolFee::initUI()
     ui->tableWidget->setSortingEnabled(true);
 
     ui->tableWidget->setColumnWidth(0,50);
-    ui->tableWidget->setColumnWidth(1,115);
-    ui->tableWidget->setColumnWidth(2,140);
+    ui->tableWidget->setColumnWidth(1,143);
+    ui->tableWidget->setColumnWidth(2,125);
     ui->tableWidget->setColumnWidth(3,125);
-    ui->tableWidget->setColumnWidth(4,45);
-    ui->tableWidget->setColumnWidth(5,45);
-    ui->tableWidget->setColumnWidth(6,50);
-    ui->tableWidget->setColumnWidth(7,50);
-    ui->tableWidget->setColumnWidth(8,55);
+    ui->tableWidget->setColumnWidth(4,60);
+    ui->tableWidget->setColumnWidth(5,50);
+    ui->tableWidget->setColumnWidth(6,60);
+    ui->tableWidget->setColumnWidth(7,60);
+
+    //m_headers<<"编号"<<"原始文件"<<"提交时间"<<"完成时间"<<"计费条数"<<"单价"<<"费用"<<"赠送消耗";
 }
 
 void FormWoolFee::setTableWidgetNoData(QTableWidget *tableWidget)
@@ -165,6 +166,7 @@ void FormWoolFee::fillDataList(QTableWidget *tableWidget,QStringList keys,
     tableWidget->sortByColumn(0);
     tableWidget->sortByColumn(0);
 }
+
 void FormWoolFee::setCellElement(QTableWidget *tableWidget, int row, int col,
                                      QString key,QString value,QMap<QString,QString> data)
 {
@@ -173,15 +175,15 @@ void FormWoolFee::setCellElement(QTableWidget *tableWidget, int row, int col,
     QVariant tooltip = value;
     item->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
     //进行数据翻译
-    if(key=="chargeid")
+    if(key=="taskid")
     {
         display = value.toInt();
     }
-    else if(key=="chargemoney")
+    else if(key=="settlefee")
     {
         display = value.toDouble();
     }
-    else if(key=="giftmoney")
+    else if(key=="giftfee")
     {
         display = value.toDouble();
     }
@@ -192,13 +194,13 @@ void FormWoolFee::setCellElement(QTableWidget *tableWidget, int row, int col,
     item->setData(Qt::UserRole,value);
     item->setData(Qt::ToolTipRole,tooltip);
     tableWidget->setItem(row,col,item);
-
 }
+
 void FormWoolFee::query()
 {
     QString dateStart = ui->dateEditStart->text();
     QString dateEnd = ui->dateEditEnd->text();
-    QString userHash = m_account.value("userhash");
+    QString userHash = m_account.value("ssohash");
     QString json = m_wool->GetCostInfo(dateStart,dateEnd,userHash);
     QMultiMap<QString,QString> list;
     RespGetCostInfo response(json);
@@ -296,13 +298,11 @@ void FormWoolFee::showRtnMessage(int row)
     }
 }
 
-
-
-
 void FormWoolFee::onDataUpdated()
 {
     query();
 }
+
 bool FormWoolFee::chkAccountState(AccountLoginState state)
 {
 
@@ -323,6 +323,7 @@ bool FormWoolFee::chkAccountState(AccountLoginState state)
     }
     return ret;
 }
+
 void FormWoolFee::on_pushButtonQuery_clicked()
 {
     if(!chkAccountState(m_state))
@@ -339,6 +340,7 @@ void FormWoolFee::on_pushButtonQuery_clicked()
     ui->labelState->setText("");
     ui->pushButtonQuery->setEnabled(true);
 }
+
 bool FormWoolFee::checkLastClickTime(QObject *button)
 {
     QPushButton *btn = qobject_cast<QPushButton*>(button);
@@ -354,5 +356,4 @@ bool FormWoolFee::checkLastClickTime(QObject *button)
     }
     m_clickTime.insert(btn->objectName(),QDateTime::currentDateTime());
     return true;
-
 }

sncprojects/lib/SNCWool/formwoolfinished.cpp

@@ -1,8 +1,9 @@
 #include "formwoolfinished.h"
 #include "ui_formwoolfinished.h"
 #include "sncdatabase.h"
-#include "respdlresultfile.h"
+#include "respdlfhymresultfile.h"
 #include "zip.h"
+
 FormWoolFinished::FormWoolFinished(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::FormWoolFinished)
@@ -14,10 +15,10 @@ FormWoolFinished::FormWoolFinished(QWidget *parent) :
     setDetailNoData();
 }
 
-void FormWoolFinished::setClientID(QString clientID)
-{
-    m_clientID = clientID;
-}
+//void FormWoolFinished::setClientID(QString clientID)
+//{
+//    m_clientID = clientID;
+//}
 
 void FormWoolFinished::setClientName(QString clientName)
 {
@@ -38,20 +39,20 @@ FormWoolFinished::~FormWoolFinished()
     delete m_movieBig;
     delete m_wool;
     delete ui;
-    qDebug()<<QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
-           <<"FormWool.FormWoolFinished Destroyed.";
+    qDebug() << QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")\
+            << "FormWool.FormWoolFinished Destroyed.";
 }
 void FormWoolFinished::initVariables()
 {
+    m_clientName = "wool";
     m_movieBig = new QMovie(":/fetchfromserver.gif");
     m_movieBig->start();
 
+    m_keys << "taskid" << "isdeliver" << "pnumfiletype" << "origfilename" << "createtime" << "finishtime"\
+           << "hmzs" << "feecount" << "zcsl" << "ycsl" << "wzsl" << "settlefee" << "giftfee";
 
-    m_keys<<"batchid"<<"isdeliver"<<"ispass"<<"detail"<<"resulttj"<<"submittime"<<"finishtime"\
-         <<"finishcount"<<"settlefee"<<"giftfee";
-
-    m_headers<<""<<"状态"<<"是否放行"<<"原始文件"<<"详细统计"<<"提交时间"<<"完成时间"\
-            <<"已检测"<<"费用"<<"赠送消耗"<<"下载";
+    m_headers << "" << "状态" << "文件类型" << "原始文件" << "提交时间" << "完成时间" \
+              << "号码总数" << "计费数量" << "正常数量" << "异常数量" << "未知数量" << "费用" << "赠送消耗" << "下载";
     m_state = NotLogin;
     m_curLtfid = "";
     m_curQryid = "";
@@ -59,12 +60,13 @@ void FormWoolFinished::initVariables()
 
     m_wool = new WSWool();
 }
+
 void FormWoolFinished::setAccountInfo(QMap<QString, QString> info)
 {
     m_account = info;
     QString ssoHash = info.value("ssohash");
     QString userCode = info.value("usercode");
-    QString userHash = info.value("userhash");
+    QString userHash = info.value("ssohash");
     if(!ssoHash.isEmpty())
     {
         if(!userHash.isEmpty())
@@ -118,15 +120,21 @@ void FormWoolFinished::initUI()
     ui->tableWidget->setColumnWidth(col++,20);
     ui->tableWidget->setColumnWidth(col++,30);
     ui->tableWidget->setColumnWidth(col++,0);
-    ui->tableWidget->setColumnWidth(col++,110);
-    ui->tableWidget->setColumnWidth(col++,0);//
-    ui->tableWidget->setColumnWidth(col++,140);
+    ui->tableWidget->setColumnWidth(col++,130);
+    ui->tableWidget->setColumnWidth(col++,0);
     ui->tableWidget->setColumnWidth(col++,140);
+    ui->tableWidget->setColumnWidth(col++,0);
     ui->tableWidget->setColumnWidth(col++,73);
-    ui->tableWidget->setColumnWidth(col++,61);
     ui->tableWidget->setColumnWidth(col++,60);
+    ui->tableWidget->setColumnWidth(col++,60);
+    ui->tableWidget->setColumnWidth(col++,60);
+    ui->tableWidget->setColumnWidth(col++,60);
+    ui->tableWidget->setColumnWidth(col++,0);
     ui->tableWidget->setColumnWidth(col++,40);
 
+    //m_headers << "" << "状态" << "文件类型" << "原始文件" << "提交时间" << "完成时间" \
+    //<< "号码总数" << "计费数量" << "正常数量" << "异常数量" << "未知数量" << "费用" << "赠送消耗" << "下载";
+
     ui->widgetExactCheck->setProperty("class","lowframe2");
 
     //初始化预检测 实号、空、停、关机对应的显示图片exact_result_bg.jpg
@@ -134,40 +142,25 @@ void FormWoolFinished::initUI()
     int nHeight = exact_result_bg.height()/10;
     int nWidth = exact_result_bg.width();
 
-    ui->labelBarQwld->setPixmap(exact_result_bg.copy(QRect(0 , 0 * nHeight, nWidth, nHeight)));
-    ui->labelBarLaji->setPixmap(exact_result_bg.copy(QRect(0 , 1 * nHeight, nWidth, nHeight)));
-    ui->labelBarShiHao->setPixmap(exact_result_bg.copy(QRect(0 , 2 * nHeight, nWidth, nHeight)));
-    ui->labelBarKong->setPixmap(exact_result_bg.copy(QRect(0 , 3 * nHeight, nWidth, nHeight)));
-    ui->labelBarTing->setPixmap(exact_result_bg.copy(QRect(0 , 4 * nHeight, nWidth, nHeight)));
-    ui->labelBarGuan->setPixmap(exact_result_bg.copy(QRect(0 , 5 * nHeight, nWidth, nHeight)));
-
-    ui->labelBarHrxz->setPixmap(exact_result_bg.copy(QRect(0 , 6 * nHeight, nWidth, nHeight)));
-    ui->labelBarWfjt->setPixmap(exact_result_bg.copy(QRect(0 , 7 * nHeight, nWidth, nHeight)));
-    ui->labelBarLdtx->setPixmap(exact_result_bg.copy(QRect(0 , 8 * nHeight, nWidth, nHeight)));
-    ui->labelBarOther->setPixmap(exact_result_bg.copy(QRect(0 , 9 * nHeight, nWidth, nHeight)));
+    ui->labelBarZc->setPixmap(exact_result_bg.copy(QRect(0 , 0 * nHeight, nWidth, nHeight)));
+    ui->labelBarYc->setPixmap(exact_result_bg.copy(QRect(0 , 1 * nHeight, nWidth, nHeight)));
+    ui->labelBarWz->setPixmap(exact_result_bg.copy(QRect(0 , 4 * nHeight, nWidth, nHeight)));
 
     //初始化图例图标实号、空、停、关机对应的显示图片sample_small.jpg
     QPixmap sample_small(":/sample_small.jpg");
     nHeight = sample_small.height();
     nWidth = sample_small.width()/10;
 
-    ui->labelSampleQwdr->setPixmap(sample_small.copy(QRect(0 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleLaji->setPixmap(sample_small.copy(QRect(1 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleShiHao->setPixmap(sample_small.copy(QRect(2 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleKong->setPixmap(sample_small.copy(QRect(3 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleTing->setPixmap(sample_small.copy(QRect(4 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleGuan->setPixmap(sample_small.copy(QRect(5 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleHrxz->setPixmap(sample_small.copy(QRect(6 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleWfjt->setPixmap(sample_small.copy(QRect(7 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleLdtx->setPixmap(sample_small.copy(QRect(8 * nWidth , 0 , nWidth, nHeight)));
-    ui->labelSampleOther->setPixmap(sample_small.copy(QRect(9 * nWidth , 0 , nWidth, nHeight)));
+    ui->labelSampleZc->setPixmap(sample_small.copy(QRect(0 * nWidth , 0 , nWidth, nHeight)));
+    ui->labelSampleYc->setPixmap(sample_small.copy(QRect(1 * nWidth , 0 , nWidth, nHeight)));
+    ui->labelSampleWz->setPixmap(sample_small.copy(QRect(4 * nWidth , 0 , nWidth, nHeight)));
 
     ui->pushButtonDel->setVisible(false);
 }
 
 void FormWoolFinished::setTableWidgetNoData(QTableWidget *tableWidget)
 {
-    prepareTableWidgetCells(tableWidget,8);
+    prepareTableWidgetCells(tableWidget,15);
     tableWidget->setEnabled(false);
     QTableWidgetItem *item = new QTableWidgetItem();
     item->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
@@ -177,33 +170,19 @@ void FormWoolFinished::setTableWidgetNoData(QTableWidget *tableWidget)
 
 void FormWoolFinished::setDetailNoData()
 {
-    ui->labelShiHao->setText("实号");
-    ui->labelKong->setText("空号");
-    ui->labelTing->setText("停机");
-    ui->labelGuan->setText("关机");
-    ui->labelWfjt->setText("无法接通");
-    ui->labelLdtx->setText("来电提醒");
-    ui->labelHrxz->setText("呼入限制");
-    ui->labelQwld->setText("请勿来电");
-    ui->labelLaji->setText("垃圾号码");
-    ui->labelOther->setText("其他");
+    ui->labelZc->setText("正常");
+    ui->labelYc->setText("异常");
+    ui->labelWz->setText("未知");
 
     //设置上述状态比例的默认宽度为0
-    ui->labelBarShiHao->setFixedWidth(0);
-    ui->labelBarKong->setFixedWidth(0);
-    ui->labelBarTing->setFixedWidth(0);
-    ui->labelBarGuan->setFixedWidth(0);
-    ui->labelBarWfjt->setFixedWidth(0);
-    ui->labelBarLdtx->setFixedWidth(0);
-    ui->labelBarHrxz->setFixedWidth(0);
-    ui->labelBarQwld->setFixedWidth(0);
-    ui->labelBarLaji->setFixedWidth(0);
-    ui->labelBarOther->setFixedWidth(0);
+    ui->labelBarZc->setFixedWidth(0);
+    ui->labelBarYc->setFixedWidth(0);
+    ui->labelBarWz->setFixedWidth(0);
 }
 
 void FormWoolFinished::setTableWidgetSyncData(QTableWidget *tableWidget)
 {
-    prepareTableWidgetCells(tableWidget,8);
+    prepareTableWidgetCells(tableWidget,15);
     tableWidget->setEnabled(false);
     QLabel *lbl = new QLabel();
 
@@ -221,7 +200,7 @@ void FormWoolFinished::prepareTableWidgetCells(QTableWidget *tableWidget, int ro
     tableWidget->setRowCount(rows);
 }
 
-void FormWoolFinished::fillDataList(QTableWidget *tableWidget,QStringList keys,
+void FormWoolFinished::fillDataList(QTableWidget *tableWidget, QStringList keys,
                                    QMultiMap<QString, QString> list, int rowCount)
 {
     setTableWidgetNoData(tableWidget);
@@ -229,7 +208,7 @@ void FormWoolFinished::fillDataList(QTableWidget *tableWidget,QStringList keys,
     {
         return ;
     }
-    prepareTableWidgetCells(tableWidget,rowCount);
+    prepareTableWidgetCells(tableWidget, rowCount);
     tableWidget->setEnabled(true);
     for(int row = 0;row < rowCount;row++)
     {
@@ -260,6 +239,7 @@ void FormWoolFinished::fillDataList(QTableWidget *tableWidget,QStringList keys,
     tableWidget->sortByColumn(0);
     tableWidget->sortByColumn(0);
 }
+
 void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int col,
                                      QString key,QString value,QMap<QString,QString> data)
 {
@@ -267,9 +247,9 @@ void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int co
     QVariant display = value;
     QVariant tooltip = value;
     item->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
-    //进行数据翻译
 
-    if(key=="batchid")
+    //进行数据翻译
+    if(key=="taskid")
     {
         display = "";
         tooltip = "";
@@ -289,7 +269,12 @@ void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int co
         }
         item->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
     }
-    else if(key=="finishcount")
+    else if(key=="origfilename")
+    {
+        display = value;
+        tooltip = display;
+    }    
+    else if(key=="feecount")
     {
         display = value.toInt();
         tooltip = display;
@@ -304,8 +289,8 @@ void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int co
         display = value.toDouble();
         tooltip = display;
     }
-    //设置单元格显示形式,是用item填充还是widget填充
 
+    //设置单元格显示形式,是用item填充还是widget填充
     if(key == "isdeliver")
     {
         delete item;
@@ -314,17 +299,17 @@ void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int co
         lbl->setProperty("value",value);
         if(value=="0")
         {
-            QString ispass = data.value("ispass");
+            /*QString ispass = data.value("ispass");
             if(ispass=="0")
             {
                 lbl->setPixmap(QPixmap(":/task_nopass.png"));
                 lbl->setToolTip("未放行");
             }
             else
-            {
+            {*/
                 lbl->setPixmap(QPixmap(":/todown.png"));
                 lbl->setToolTip("未下载");
-            }
+            //}
         }
         else if(value=="1")
         {
@@ -340,13 +325,12 @@ void FormWoolFinished::setCellElement(QTableWidget *tableWidget, int row, int co
         item->setData(Qt::ToolTipRole,tooltip);
         tableWidget->setItem(row,col,item);
     }
-
-
 }
+
 void FormWoolFinished::query(QString dealstatus)
 {
     QString userCode = m_account.value("usercode");
-    QMultiMap<QString,QString> list = SNCDataBase::getWoolCheckFinishInfos(userCode,m_clientID,dealstatus);
+    QMultiMap<QString,QString> list = SNCDataBase::getWoolCheckFinishInfos(userCode, dealstatus);
     int cols = list.uniqueKeys().size();
     int rows = 0;
     if(cols!=0)
@@ -366,7 +350,7 @@ void FormWoolFinished::query(QString dealstatus)
         {
             if(item->checkState()==Qt::Checked)
             {
-                ids<<item->data(Qt::UserRole).toString();
+                ids << item->data(Qt::UserRole).toString();
             }
             if(item->isSelected())
             {
@@ -436,64 +420,29 @@ bool FormWoolFinished::addFileToZip(QString zipName, QStringList files)
     return true;
 }
 
-void FormWoolFinished::displaySelected(QString detail)
-{
-    QStringList list = detail.split("\r\n");
-    qDebug()<<list.size()<<list;
-    int i=0;
-    int k = 0;
-    if(list.size()==10)
-    {
-        k=0;
-    }
-    else
+void FormWoolFinished::displaySelected(int hmzs, int zcsl, int ycsl, int wzsl)
+{    
+    if(!(hmzs > 0))
     {
         setDetailNoData();
         return;
     }
 
-    QStringList rates;
-    for(int i=0;i<list.size();i++)
-    {
-        QRegExp rx("\\((.+)\\)");
-        int pos = rx.indexIn(list.at(i));
-        if(pos>0)
-        {
-            QString match = rx.capturedTexts().at(1);
-            rates<<match.replace("%","");
-        }
-        else
-        {
-            rates<<"0";
-        }
-    }
-    i = k;
-    ui->labelKong->setText(list.at(i++));
-    ui->labelTing->setText(list.at(i++));
-    ui->labelGuan->setText(list.at(i++));
-    ui->labelHrxz->setText(list.at(i++));
-    ui->labelWfjt->setText(list.at(i++));
-    ui->labelLdtx->setText(list.at(i++));
-    ui->labelShiHao->setText(list.at(i++));
-    ui->labelQwld->setText(list.at(i++));
-    ui->labelLaji->setText(list.at(i++));
-    ui->labelOther->setText(list.at(i++));
-    i = k;
-    int barLength = 650;
+    double rateZc, rateYc, rateWz;
+    rateZc = zcsl*1.0/hmzs;
+    rateYc = ycsl*1.0/hmzs;
+    rateWz = wzsl*1.0/hmzs;
 
-    ui->labelBarKong->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarTing->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarGuan->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarWfjt->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarHrxz->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarLdtx->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarShiHao->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarQwld->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarLaji->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
-    ui->labelBarOther->setFixedWidth(rates.at(i++).toDouble()*barLength/100);
+    ui->labelZc->setText(QString("正常: %1 (%2%)").arg(zcsl).arg(rateZc*100));
+    ui->labelYc->setText(QString("异常: %1 (%2%)").arg(ycsl).arg(rateYc*100));
+    ui->labelWz->setText(QString("未知: %1 (%2%)").arg(wzsl).arg(rateWz*100));
 
-}
+    int barLength = 650;
 
+    ui->labelBarZc->setFixedWidth(rateZc*barLength);
+    ui->labelBarYc->setFixedWidth(rateYc*barLength);
+    ui->labelBarWz->setFixedWidth(rateWz*barLength);
+}
 
 void FormWoolFinished::onDataUpdated()
 {
@@ -603,8 +552,12 @@ void FormWoolFinished::on_tableWidget_cellClicked(int row, int column)
 {
     if(row>=0&&column>=0)
     {
-        QString detail = ui->tableWidget->item(row,4)->data(Qt::UserRole).toString();
-        displaySelected(detail);
+        //QString detail = ui->tableWidget->item(row,4)->data(Qt::UserRole).toString();
+        int hmzs = ui->tableWidget->item(row,6)->data(Qt::UserRole).toInt();
+        int zcsl = ui->tableWidget->item(row,8)->data(Qt::UserRole).toInt();
+        int ycsl = ui->tableWidget->item(row,9)->data(Qt::UserRole).toInt();
+        int wzsl = ui->tableWidget->item(row,10)->data(Qt::UserRole).toInt();
+        displaySelected(hmzs, zcsl, ycsl, wzsl);
     }
 }
 
@@ -629,19 +582,17 @@ void FormWoolFinished::on_radioButtonAll_clicked()
 void FormWoolFinished::on_radioButtonUndown_clicked()
 {
     if(!chkAccountState(m_state))
-            return;
+        return;
     on_radioButtonAll_clicked();
 }
 
 void FormWoolFinished::on_radioButtonDown_clicked()
 {
     if(!chkAccountState(m_state))
-            return;
+        return;
     on_radioButtonAll_clicked();
 }
 
-
-
 void FormWoolFinished::on_checkBoxAll_clicked()
 {
     Qt::CheckState state;
@@ -677,11 +628,11 @@ void FormWoolFinished::on_tableWidget_cellDoubleClicked(int row, int column)
         QMessageBox::critical(this,"结果","未能获取有效的文件编号！",QMessageBox::Ok);
         return ;
     }
-    if(ispass!="1")
-    {
-        QMessageBox::critical(this,"结果","单子还未放行！",QMessageBox::Ok);
-        return ;
-    }
+//    if(ispass!="1")
+//    {
+//        QMessageBox::critical(this,"结果","单子还未放行！",QMessageBox::Ok);
+//        return ;
+//    }
     QString saveFile = getSingleZipFileName(id);
     if(saveFile.isEmpty())
         return ;
@@ -690,6 +641,7 @@ void FormWoolFinished::on_tableWidget_cellDoubleClicked(int row, int column)
     this->setCursor(Qt::ArrowCursor);
 
 }
+
 bool FormWoolFinished::download(QString srvID,QString saveZipFileName,bool show)
 {
 
@@ -712,6 +664,7 @@ bool FormWoolFinished::download(QString srvID,QString saveZipFileName,bool show)
         return downloadFromServer(saveZipFileName,srvID,show);
     }
 }
+
 bool FormWoolFinished::downloadFromLocal(QString saveFileName,QString cacheFile,bool show)
 {
 
@@ -723,11 +676,11 @@ bool FormWoolFinished::downloadFromLocal(QString saveFileName,QString cacheFile,
 
 bool FormWoolFinished::downloadFromServer(QString saveFileName, QString srvID, bool show)
 {
-    QString userHash = m_account.value("userhash");
-    QString json = m_wool->dlResultFile(srvID,userHash);
+    QString userHash = m_account.value("ssohash");
+    QString json = m_wool->DlfhymResultFile(srvID,userHash);
 
-    RespDlResultFile response(json);
-    if(response.getRtnCode()==2)
+    RespDlFhymResultFile response(json);
+    if(response.getRtnCode()==1)
     {
         QString fileContent = response.getFileContent();
         QByteArray array = QByteArray::fromBase64(fileContent.toAscii());
@@ -736,7 +689,7 @@ bool FormWoolFinished::downloadFromServer(QString saveFileName, QString srvID, b
         file.write(array);
         file.close();
         QString cachPath = cacheDownloadFile(saveFileName);
-        SNCDataBase::updateWoolCachePath(srvID,cachPath);
+        SNCDataBase::updateWoolCachePath(srvID, cachPath);
         if(show)
             QMessageBox::information(this,"结果","单子下载成功",QMessageBox::Ok);
         return true;
@@ -748,6 +701,7 @@ bool FormWoolFinished::downloadFromServer(QString saveFileName, QString srvID, b
        return false;
     }
 }
+
 QString FormWoolFinished::cacheDownloadFile(QString fileName)
 {
     QString userCode = m_account.value("usercode");
@@ -763,7 +717,6 @@ QString FormWoolFinished::cacheDownloadFile(QString fileName)
 
 bool FormWoolFinished::chkAccountState(AccountLoginState state)
 {
-
     bool ret = false;
     switch(state)
     {
@@ -781,6 +734,7 @@ bool FormWoolFinished::chkAccountState(AccountLoginState state)
     }
     return ret;
 }
+
 QString FormWoolFinished::getPackZipFileName()
 {
     QFileDialog::Options options;
@@ -800,6 +754,7 @@ QString FormWoolFinished::getPackZipFileName()
             {
                 count++;
                 str +=   "_" + item->text();
+                /*
                 QTableWidgetItem *item2 = ui->tableWidget->item(i,2);
                 if(item2)
                 {
@@ -807,17 +762,17 @@ QString FormWoolFinished::getPackZipFileName()
                     {
                         download += item->data(Qt::UserRole).toString()+ " ";
                     }
-                }
+                }*/
             }
         }
     }
     if(count==0)
         return "";
-    if(!download.isEmpty())
+    /*if(!download.isEmpty())
     {
         QMessageBox::critical(this,"提示","您选择的单子" + download + "现在还没有放行，暂时无法下载，请稍候再试!",QMessageBox::Ok);
         return "";
-    }
+    }*/
     defaultZipFileName += "_" + QString::number(count) + str  ;
     QString saveZipFileName = QFileDialog::getSaveFileName(this,"另存为",exportDir + "\\" + defaultZipFileName,
                                                            tr("ZIP Files (*.zip)"),
@@ -832,7 +787,6 @@ QString FormWoolFinished::getPackZipFileName()
     return saveZipFileName;
 }
 
-
 void FormWoolFinished::on_pushButtonDel_clicked()
 {
     if(!chkAccountState(m_state))
@@ -895,7 +849,7 @@ void FormWoolFinished::onSingleDownloadClick()
      QPushButton *btn = qobject_cast<QPushButton*>(sender());
      for(int i=0;i<ui->tableWidget->rowCount();i++)
      {
-        QWidget *widget = ui->tableWidget->cellWidget(i,10);
+        QWidget *widget = ui->tableWidget->cellWidget(i,13);
         if(widget)
         {
             if(btn==qobject_cast<QPushButton*>(widget))
@@ -905,5 +859,4 @@ void FormWoolFinished::onSingleDownloadClick()
             }
         }
      }
-
 }

sncprojects/lib/SNCWool/formwoolfinished.h

@@ -15,7 +15,7 @@ class FormWoolFinished : public QWidget
     
 public:
     explicit FormWoolFinished(QWidget *parent = 0);
-    void setClientID(QString clientID);
+//    void setClientID(QString clientID);
     void setClientName(QString clientName);
     void setHost(QString host,QString port);
     ~FormWoolFinished();
@@ -56,7 +56,7 @@ private:
     void query(QString dealstatus);
     void showRtnMessage(int row);
     bool addFileToZip(QString zipName,QStringList files);
-    void displaySelected(QString detail);                                       //当用户点击时，以图形化方式显示单子详细信息
+    void displaySelected(int hmzs, int zcsl, int ycsl, int wzsl);                //当用户点击时，以图形化方式显示单子详细信息
     bool download(QString srvID,QString saveFileName,bool show);
     bool downloadFromLocal(QString saveFileName,QString cacheFile,bool show);
     bool downloadFromServer(QString saveFileName,QString srvID,bool show);
@@ -66,7 +66,7 @@ private:
     bool chkAccountState(AccountLoginState state);
 private:
     Ui::FormWoolFinished *ui;
-    QString m_clientID;
+//    QString m_clientID;
     QString m_clientName;
     QString m_host;
     QString m_port;

sncprojects/lib/SNCWool/formwoolfinished.ui

@@ -93,13 +93,13 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>150</height>
+       <height>90</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>16777215</width>
-       <height>200</height>
+       <height>90</height>
       </size>
      </property>
      <property name="title">
@@ -153,7 +153,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="labelBarKong">
+              <widget class="QLabel" name="labelBarZc">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -161,12 +161,12 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>kong</string>
+                <string>zc</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelBarTing">
+              <widget class="QLabel" name="labelBarYc">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -174,12 +174,12 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>ting</string>
+                <string>yc</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelBarGuan">
+              <widget class="QLabel" name="labelBarWz">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -187,80 +187,7 @@
                 </sizepolicy>
                </property>
                <property name="text">
-                <string>guan</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarHrxz">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>hrxz</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarWfjt">
-               <property name="text">
-                <string>wfjt</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarLdtx">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>ldtx</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarShiHao">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>shihao</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarQwld">
-               <property name="text">
-                <string>qwld</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarLaji">
-               <property name="text">
-                <string>laji</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelBarOther">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>qita</string>
+                <string>wz</string>
                </property>
               </widget>
              </item>
@@ -316,7 +243,7 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="labelSampleKong">
+              <widget class="QLabel" name="labelSampleZc">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -336,7 +263,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>空号</string>
+                <string>正常</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -344,7 +271,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelKong">
+              <widget class="QLabel" name="labelZc">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -364,12 +291,12 @@
                 </size>
                </property>
                <property name="text">
-                <string>空号</string>
+                <string>正常</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelSampleTing">
+              <widget class="QLabel" name="labelSampleYc">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -389,7 +316,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>停机</string>
+                <string>异常</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -397,7 +324,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelTing">
+              <widget class="QLabel" name="labelYc">
                <property name="minimumSize">
                 <size>
                  <width>150</width>
@@ -411,12 +338,12 @@
                 </size>
                </property>
                <property name="text">
-                <string>停机</string>
+                <string>异常</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelSampleGuan">
+              <widget class="QLabel" name="labelSampleWz">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                  <horstretch>0</horstretch>
@@ -436,7 +363,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>关机</string>
+                <string>未知</string>
                </property>
                <property name="alignment">
                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -444,7 +371,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QLabel" name="labelGuan">
+              <widget class="QLabel" name="labelWz">
                <property name="minimumSize">
                 <size>
                  <width>150</width>
@@ -458,7 +385,7 @@
                 </size>
                </property>
                <property name="text">
-                <string>关机</string>
+                <string>未知</string>
                </property>
               </widget>
              </item>
@@ -480,387 +407,6 @@
           </item>
          </layout>
         </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_33">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QWidget" name="widget_2" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_34">
-             <property name="spacing">
-              <number>6</number>
-             </property>
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="labelSampleHrxz">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>实号</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelHrxz">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>呼入限制</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelSampleWfjt">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>空号</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelWfjt">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>无法接通</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelSampleLdtx">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>提醒</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelLdtx">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>来电提醒</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_20">
-               <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>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QWidget" name="widget_3" native="true">
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLabel" name="labelSampleShiHao">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>实号</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelShiHao">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>实号</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelSampleQwdr">
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>勿</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelQwld">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>请勿来单</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelSampleLaji">
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>垃圾</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelLaji">
-               <property name="minimumSize">
-                <size>
-                 <width>150</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>150</width>
-                 <height>16777215</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>垃圾</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelSampleOther">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>10</width>
-                 <height>20</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>它</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelOther">
-               <property name="minimumSize">
-                <size>
-                 <width>120</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>120</width>
-                 <height>16777215</height>
-                </size>
-               </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>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </item>
      </layout>

sncprojects/lib/SNCWool/formwoolupload.cpp

@@ -44,7 +44,7 @@ void FormWoolUpload::setAccountInfo(QMap<QString, QString> info)
     m_account = info;
     QString ssoHash = info.value("ssohash");
     QString userCode = info.value("usercode");
-    QString userHash = info.value("userhash");
+    QString userHash = info.value("ssohash");
     if(!ssoHash.isEmpty())
     {
         if(!userHash.isEmpty())
@@ -79,10 +79,10 @@ void FormWoolUpload::setClientName(QString name)
     m_clientName = name;
 }
 
-void FormWoolUpload::setClientID(QString clientID)
-{
-    m_clientID = clientID;
-}
+//void FormWoolUpload::setClientID(QString clientID)
+//{
+//    m_clientID = clientID;
+//}
 
 void FormWoolUpload::initUI()
 {
@@ -197,6 +197,7 @@ void FormWoolUpload::fillDataList(QTableWidget *tableWidget,QStringList keys,
     tableWidget->sortByColumn(0);
     tableWidget->sortByColumn(0);
 }
+
 void FormWoolUpload::setCellElement(QTableWidget *tableWidget, int row, int col,
                                      QString key,QString value,QMap<QString,QString> data)
 {
@@ -205,7 +206,7 @@ void FormWoolUpload::setCellElement(QTableWidget *tableWidget, int row, int col,
     QVariant tooltip = value;
     item->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
     //进行数据翻译
-    if(key=="filetype")
+    if(key == "filetype")
     {
         if(value=="1")
             display = "号码文件";
@@ -230,7 +231,7 @@ void FormWoolUpload::setCellElement(QTableWidget *tableWidget, int row, int col,
     }
 
     //设置单元格显示形式,是用item填充还是widget填充
-    if(key=="uploadstate")
+    if(key == "uploadstate")
     {
         delete item;
 
@@ -299,10 +300,11 @@ void FormWoolUpload::setCellElement(QTableWidget *tableWidget, int row, int col,
         tableWidget->setItem(row,col,item);
     }
 }
+
 void FormWoolUpload::query()
 {
     QString userCode = m_account.value("usercode");
-    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload("Wool",m_clientID,userCode);
+    QMultiMap<QString,QString> list = SNCDataBase::getAllUpload("wool","",userCode);
     int cols = list.uniqueKeys().size();
     int rows = 0;
     if(cols!=0)
@@ -397,9 +399,10 @@ void FormWoolUpload::on_pushButtonAddFile_clicked()
     DialogSubmit dialog(this);
     connect(&dialog,SIGNAL(dataUpdated()),this,SLOT(onDataUpdated()));
     dialog.setUserCode(userCode);
-    dialog.setClientID(m_clientID);
+//    dialog.setClientID(m_clientID);
     dialog.exec();
 }
+
 void FormWoolUpload::onPushButtonViewsClicked()
 {
     QPushButton *btn = qobject_cast<QPushButton*>(sender());
@@ -457,8 +460,9 @@ void FormWoolUpload::on_pushButtonDel_clicked()
         QMessageBox::critical(this,"提示","请选择要删除的单子",QMessageBox::Ok);
         return ;
     }
+    /*
     for(int i=0;i<ui->tableWidget->rowCount();i++)
-    {
+    {       
         QTableWidgetItem *item = ui->tableWidget->item(i,0);
         if(item)
         {
@@ -473,12 +477,11 @@ void FormWoolUpload::on_pushButtonDel_clicked()
                     {
                         QMessageBox::critical(this,"提示","只能删除上传任务已经结束的单子！",QMessageBox::Ok);
                         return ;
-
                     }
                 }
             }
         }
-    }
+    }*/
     for(int i=0;i<ui->tableWidget->rowCount();i++)
     {
         QTableWidgetItem *item = ui->tableWidget->item(i,0);
@@ -494,11 +497,11 @@ void FormWoolUpload::on_pushButtonDel_clicked()
     query();
 }
 
-
 void FormWoolUpload::on_tableWidget_cellDoubleClicked(int row, int column)
 {
     showRtnMessage(row);
 }
+
 bool FormWoolUpload::chkAccountState(AccountLoginState state)
 {
 

sncprojects/lib/SNCWool/formwoolupload.h

@@ -18,7 +18,7 @@ public:
 public slots:
     void setAccountInfo(QMap<QString,QString> info);
     void setClientName(QString name);
-    void setClientID(QString clientID);
+//    void setClientID(QString clientID);
 private slots:
 
     void onPushButtonViewsClicked();

sncprojects/lib/WSWool/WSWool.pro

@@ -16,32 +16,32 @@ LIBS += ../../output/sncdatabase.dll
 
 SOURCES += wswool.cpp \
     wool.cpp \
-    respchkuserfeestatus.cpp \
-    respdlresultfile.cpp \
     respgetchargeinfo.cpp \
     respgetcostinfo.cpp \
-    respgetdealinfo.cpp \
-    respgetfinishedinfo.cpp \
     respgetsysparam.cpp \
     respgetuserblance.cpp \
     resppackmerge.cpp \
     resppacktran.cpp \
-    respsubminpnum.cpp \
+    respdlfhymresultfile.cpp \
+    respgetfhymtask.cpp \
+    respgetfhymht.cpp \
+    respsubmitfhymfile.cpp \
+    respuserserviceverify.cpp \
 
 HEADERS += wswool.h\
         WSWool_global.h \
     wool.h \
-    respchkuserfeestatus.h \
-    respdlresultfile.h \
     respgetchargeinfo.h \
     respgetcostinfo.h \
-    respgetdealinfo.h \
-    respgetfinishedinfo.h \
     respgetsysparam.h \
     respgetuserblance.h \
     resppackmerge.h \
     resppacktran.h \
-    respsubminpnum.h \
+    respdlfhymresultfile.h \
+    respgetfhymtask.h \
+    respgetfhymht.h \
+    respsubmitfhymfile.h \
+    respuserserviceverify.h \
 
 unix:!symbian {
     maemo5 {

sncprojects/lib/WSWool/respchkuserfeestatus.h

@@ -1,18 +0,0 @@
-#ifndef RESPCHKUSERFEESTATUS_H
-#define RESPCHKUSERFEESTATUS_H
-#include <QtCore>
-#include "WSWool_global.h"
-
-class WSWOOLSHARED_EXPORT RespChkUserFeeStatus
-{
-public:
-    RespChkUserFeeStatus(QString json);
-    int getRtnCode();
-    QString getRtnMemo();
-private:
-    int rtnCode;
-    QString rtnMemo;
-    QString json;
-};
-
-#endif // RESPCHKUSERFEESTATUS_H

sncprojects/lib/WSWool/respdlresultfile.cpp → sncprojects/lib/WSWool/respdlfhymresultfile.cpp

@@ -1,8 +1,9 @@
-#include "respdlresultfile.h"
+#include "respdlfhymresultfile.h"
 #include <QScriptValue>
 #include <QScriptEngine>
 #include <QScriptValueIterator>
-RespDlResultFile::RespDlResultFile(QString json)
+
+RespDlFhymResultFile::RespDlFhymResultFile(QString json)
 {
     this->json = json;
     QScriptEngine engine;
@@ -50,23 +51,23 @@ RespDlResultFile::RespDlResultFile(QString json)
     }
 
 }
-int RespDlResultFile::getRtnCode()
+int RespDlFhymResultFile::getRtnCode()
 {
     return this->rtnCode;
 }
-QString RespDlResultFile::getRtnMemo()
+QString RespDlFhymResultFile::getRtnMemo()
 {
     return this->rtnMemo;
 }
-QString RespDlResultFile::getFileName()
+QString RespDlFhymResultFile::getFileName()
 {
     return this->fileName;
 }
-QString RespDlResultFile::getFileContent()
+QString RespDlFhymResultFile::getFileContent()
 {
     return this->fileContent;
 }
-QString RespDlResultFile::getFcEncodeType()
+QString RespDlFhymResultFile::getFcEncodeType()
 {
     return this->fcEncodeType;
 }

sncprojects/lib/WSWool/respdlresultfile.h → sncprojects/lib/WSWool/respdlfhymresultfile.h

@@ -1,12 +1,12 @@
-#ifndef RESPDLRESULTFILE_H
-#define RESPDLRESULTFILE_H
+#ifndef RESPDLFHYMRESULTFILE_H
+#define RESPDLFHYMRESULTFILE_H
 #include <QtCore>
 #include "WSWool_global.h"
 
-class WSWOOLSHARED_EXPORT RespDlResultFile
+class WSWOOLSHARED_EXPORT RespDlFhymResultFile
 {
 public:
-    RespDlResultFile(QString json);
+    RespDlFhymResultFile(QString json);
     int getRtnCode();
     QString getRtnMemo();
     QString getFileName();
@@ -21,4 +21,4 @@ private:
     QString fileContent;
     QString fcEncodeType;
 };
-#endif // RESPDLRESULTFILE_H
+#endif // RESPDLFHYMRESULTFILE_H

sncprojects/lib/WSWool/respgetchargeinfo.cpp

@@ -41,22 +41,53 @@ RespGetChargeInfo::RespGetChargeInfo(QString json)
             {
                 this->totalMoney = it.value().toInt32();
             }
+            else if(it.name()=="rs")
+            {
+                QScriptValueIterator it2(it.value());
+                while(it2.hasNext()) {
+                    it2.next();
+                    if (it2.flags() & QScriptValue::SkipInEnumeration)
+                        continue;
+
+                    QScriptValue sv1 = it2.value();
+
+                    if (sv1.property("chargeid").toInt32() > 0) {
+                        map.insert("serialnum",sv1.property("serialnum").toString());
+                        map.insert("chargeid",sv1.property("chargeid").toString());
+                        map.insert("usercode",sv1.property("usercode").toString());
+                        map.insert("discountset",sv1.property("discountset").toString());
+                        map.insert("premoney",sv1.property("premoney").toString());
+                        map.insert("chargemoney",sv1.property("chargemoney").toString());
+                        map.insert("aftermoney",sv1.property("aftermoney").toString());
+                        map.insert("pregiftmoney",sv1.property("pregiftmoney").toString());
+                        map.insert("giftmoney",sv1.property("giftmoney").toString());
+                        map.insert("aftergiftmoney",sv1.property("aftergiftmoney").toString());
+                        map.insert("chargetime",sv1.property("chargetime").toString());
+                        map.insert("memo",sv1.property("memo").toString());
+                        map.insert("invoicememo",sv1.property("invoicememo").toString());
+                        map.insert("faxmemo",sv1.property("faxmemo").toString());
+                    }
+                }
+            }
             else
             {
+                /*
                 QScriptValue sv1 = it.value();
                 map.insert("serialnum",sv1.property("serialnum").toString());
                 map.insert("chargeid",sv1.property("chargeid").toString());
-//                map.insert("batchtype",sv1.property("batchtype").toString());
                 map.insert("usercode",sv1.property("usercode").toString());
+                map.insert("discountset",sv1.property("discountset").toString());
                 map.insert("premoney",sv1.property("premoney").toString());
                 map.insert("chargemoney",sv1.property("chargemoney").toString());
-                map.insert("aftermoney",sv1.property("aftermoney").toString());
-                map.insert("chargetime",sv1.property("chargetime").toString());
-                map.insert("memo",sv1.property("memo").toString());
-                map.insert("discountset",sv1.property("discountset").toString());
+                map.insert("aftermoney",sv1.property("aftermoney").toString());                
                 map.insert("pregiftmoney",sv1.property("pregiftmoney").toString());
-                map.insert("aftergiftmoney",sv1.property("aftergiftmoney").toString());
                 map.insert("giftmoney",sv1.property("giftmoney").toString());
+                map.insert("aftergiftmoney",sv1.property("aftergiftmoney").toString());
+                map.insert("chargetime",sv1.property("chargetime").toString());
+                map.insert("memo",sv1.property("memo").toString());
+                map.insert("invoicememo",sv1.property("invoicememo").toString());
+                map.insert("faxmemo",sv1.property("faxmemo").toString());
+                */
             }
         }
     }

sncprojects/lib/WSWool/respgetcostinfo.cpp

@@ -40,22 +40,47 @@ RespGetCostInfo::RespGetCostInfo(QString json)
             else if(it.name()=="sum_settlefee")
             {
                 this->totalFee = it.value().toString();
+            }            
+            else if(it.name()=="rs")
+            {
+                QScriptValueIterator it2(it.value());
+                while(it2.hasNext()) {
+                    it2.next();
+                    if (it2.flags() & QScriptValue::SkipInEnumeration)
+                        continue;
+
+                    QScriptValue sv1 = it2.value();
+
+                    if (sv1.property("taskid").toInt32() > 0) {
+                        map.insert("serialnum",sv1.property("serialnum").toString());
+                        map.insert("taskid",sv1.property("taskid").toString());
+                        map.insert("usercode",sv1.property("usercode").toString());
+                        map.insert("feecount",sv1.property("fee_count").toString());
+                        map.insert("origfilename",sv1.property("origfilename").toString());
+                        map.insert("createtime",sv1.property("create_time").toString());
+                        map.insert("finishtime",sv1.property("finish_time").toString());
+                        map.insert("price",sv1.property("price").toString());
+                        map.insert("duefee",sv1.property("duefee").toString());
+                        map.insert("settlefee",sv1.property("settlefee").toString());
+                        map.insert("giftfee",sv1.property("giftfee").toString());
+                    }
+                }
             }
             else
             {
+                /*
                 QScriptValue sv1 = it.value();
                 map.insert("serialnum",sv1.property("serialnum").toString());
-                map.insert("batchid",sv1.property("batchid").toString());
-                map.insert("batchtype",sv1.property("batchtype").toString());
-                map.insert("detail",sv1.property("detail").toString());
+                map.insert("taskid",sv1.property("taskid").toString());
                 map.insert("usercode",sv1.property("usercode").toString());
-                map.insert("submittime",sv1.property("submittime").toString());
-                map.insert("finishtime",sv1.property("finishtime").toString());
-                map.insert("numcount",sv1.property("numcount").toString());
-                map.insert("finishcount",sv1.property("finishcount").toString());
+                map.insert("feecount",sv1.property("fee_count").toString());
+                map.insert("createtime",sv1.property("create_time").toString());
+                map.insert("finishtime",sv1.property("finish_time").toString());
                 map.insert("price",sv1.property("price").toString());
+                map.insert("duefee",sv1.property("duefee").toString());
                 map.insert("settlefee",sv1.property("settlefee").toString());
                 map.insert("giftfee",sv1.property("giftfee").toString());
+                */
             }
         }
     }

sncprojects/lib/WSWool/respgetdealinfo.cpp

@@ -1,82 +0,0 @@
-#include "respgetdealinfo.h"
-#include <QScriptValue>
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-RespGetDealInfo::RespGetDealInfo(QString json)
-{
-    this->json = json;
-    QScriptEngine engine;
-    QScriptValue sv = engine.evaluate("value = " + this->json);
-    QScriptValueIterator it(sv);
-    if(json.isEmpty())
-    {
-        rtnCode = RTNCODE_NETWORK_NOTAVAILABLE;
-        rtnMemo = RTNMEMO_NETWORK_NOTAVAILABLE;
-    }
-    else if(json=="ABORT")
-    {
-        rtnCode = RTNCODE_NETWORK_ABORT;
-        rtnMemo = RTNMEMO_NETWORK_ABORT;
-    }
-    else
-    {
-        rtnCode = RTNCODE_INVALID_FORMAT;
-        rtnMemo = RTNMEMO_INVALID_FORMAT;
-        while (it.hasNext())
-        {
-            it.next();
-            if(it.name()=="rtnCode")
-            {
-                this->rtnCode = it.value().toInt32();
-            }
-            else if(it.name()=="rtnMemo")
-            {
-                this->rtnMemo = it.value().toString();
-            }
-            else if(it.name()=="rsCount")
-            {
-                this->rsCount = it.value().toInt32();
-            }
-            else
-            {
-                QScriptValue sv1 = it.value();
-                map.insert("serialnum",sv1.property("serialnum").toString());
-                map.insert("batchid",sv1.property("batchid").toString());
-                map.insert("batchtype",sv1.property("batchtype").toString());
-                map.insert("detail",sv1.property("detail").toString());
-                map.insert("resulttj",sv1.property("resulttj").toString());
-                map.insert("usercode",sv1.property("usercode").toString());
-                map.insert("submittime",sv1.property("submittime").toString());
-                map.insert("tftime",sv1.property("tftime").toString());
-                map.insert("vftime",sv1.property("vftime").toString());
-                map.insert("isverify",sv1.property("isverify").toString());
-                if(sv1.property("settlefee").toString()=="null")
-                    map.insert("settlefee","");
-                else
-                    map.insert("settlefee",sv1.property("settlefee").toString());
-                map.insert("giftfee",sv1.property("giftfee").toString());
-                map.insert("numcount",sv1.property("numcount").toString());
-                map.insert("dlcount",sv1.property("dlcount").toString());
-                map.insert("finishcount",sv1.property("finishcount").toString());
-                map.insert("optstatus",sv1.property("optstatus").toString());
-            }
-        }
-    }
-
-}
-int RespGetDealInfo::getRtnCode()
-{
-    return this->rtnCode;
-}
-QString RespGetDealInfo::getRtnMemo()
-{
-    return this->rtnMemo;
-}
-int RespGetDealInfo::getRsCount()
-{
-    return this->rsCount;
-}
-QMultiMap<QString,QString> RespGetDealInfo::getRs()
-{
-    return this->map;
-}

sncprojects/lib/WSWool/respgetfhymht.cpp

@@ -0,0 +1,122 @@
+#include "respgetfhymht.h"
+#include <QScriptValue>
+#include <QScriptEngine>
+#include <QScriptValueIterator>
+RespGetFhymHt::RespGetFhymHt(QString json)
+{
+    this->json = json;
+    QScriptEngine engine;
+    QScriptValue sv = engine.evaluate("value = " + this->json);
+    QScriptValueIterator it(sv);
+    if(json.isEmpty())
+    {
+        rtnCode = RTNCODE_NETWORK_NOTAVAILABLE;
+        rtnMemo = RTNMEMO_NETWORK_NOTAVAILABLE;
+    }
+    else if(json=="ABORT")
+    {
+        rtnCode = RTNCODE_NETWORK_ABORT;
+        rtnMemo = RTNMEMO_NETWORK_ABORT;
+    }
+    else
+    {
+        rtnCode = RTNCODE_INVALID_FORMAT;
+        rtnMemo = RTNMEMO_INVALID_FORMAT;
+        while (it.hasNext())
+        {
+            it.next();
+            if(it.name()=="rtnCode")
+            {
+                this->rtnCode = it.value().toInt32();
+            }
+            else if(it.name()=="rtnMemo")
+            {
+                this->rtnMemo = it.value().toString();
+            }
+            else if(it.name()=="rsCount")
+            {
+                this->rsCount = it.value().toInt32();
+            }
+            else if(it.name()=="rs")
+            {
+                QScriptValueIterator it2(it.value());
+                while(it2.hasNext()) {
+                    it2.next();
+                    if (it2.flags() & QScriptValue::SkipInEnumeration)
+                        continue;
+
+                    QScriptValue sv1 = it2.value();
+
+                    if (sv1.property("taskid").toInt32() > 0) {
+                        map.insert("serialnum",sv1.property("serialnum").toString());
+                        map.insert("taskid",sv1.property("taskid").toString());
+                        map.insert("usercode",sv1.property("usercode").toString());
+                        map.insert("pnumfiletype",sv1.property("pnumfiletype").toString());
+                        map.insert("origfilename",sv1.property("origfilename").toString());
+                        map.insert("hmzs",sv1.property("hmzs").toString());
+                        map.insert("zcsl",sv1.property("zcsl").toString());
+                        map.insert("ycsl",sv1.property("ycsl").toString());
+                        map.insert("wzsl",sv1.property("wzsl").toString());
+                        map.insert("feecount",sv1.property("fee_count").toString());
+                        map.insert("createtime",sv1.property("create_time").toString());
+                        map.insert("finishtime",sv1.property("finish_time").toString());
+                        map.insert("state",sv1.property("state").toString());
+                        map.insert("statestr",sv1.property("statestr").toString());
+                        map.insert("price",sv1.property("price").toString());
+                        map.insert("duefee",sv1.property("duefee").toString());
+                        map.insert("settlefee",sv1.property("settlefee").toString());
+                        map.insert("giftfee",sv1.property("giftfee").toString());
+                        map.insert("memo",sv1.property("memo").toString());
+                        map.insert("isdeliver",sv1.property("isdeliver").toString());
+                        map.insert("delivertime",sv1.property("delivertime").toString());
+                    }
+                }
+            }
+            else
+            {
+                /*
+                QScriptValue sv1 = it.value();
+                if (sv1.property("taskid").toInt32() > 0)
+                {
+                    map.insert("serialnum",sv1.property("serialnum").toString());
+                    map.insert("taskid",sv1.property("taskid").toString());
+                    map.insert("usercode",sv1.property("usercode").toString());
+                    map.insert("pnumfiletype",sv1.property("pnumfiletype").toString());
+                    map.insert("origfilename",sv1.property("origfilename").toString());
+                    map.insert("hmzs",sv1.property("hmzs").toString());
+                    map.insert("zcsl",sv1.property("zcsl").toString());
+                    map.insert("ycsl",sv1.property("ycsl").toString());
+                    map.insert("wzsl",sv1.property("wzsl").toString());
+                    map.insert("feecount",sv1.property("fee_count").toString());
+                    map.insert("createtime",sv1.property("create_time").toString());
+                    map.insert("finishtime",sv1.property("finish_time").toString());
+                    map.insert("state",sv1.property("state").toString());
+                    map.insert("statestr",sv1.property("statestr").toString());
+                    map.insert("price",sv1.property("price").toString());
+                    map.insert("duefee",sv1.property("duefee").toString());
+                    map.insert("settlefee",sv1.property("settlefee").toString());
+                    map.insert("giftfee",sv1.property("giftfee").toString());
+                    map.insert("memo",sv1.property("memo").toString());
+                    map.insert("isdeliver",sv1.property("isdeliver").toString());
+                    map.insert("delivertime",sv1.property("delivertime").toString());
+                }*/
+            }
+        }
+    }
+}
+int RespGetFhymHt::getRtnCode()
+{
+    return this->rtnCode;
+}
+QString RespGetFhymHt::getRtnMemo()
+{
+    return this->rtnMemo;
+}
+int RespGetFhymHt::getRsCount()
+{
+    return this->rsCount;
+}
+QMultiMap<QString,QString> RespGetFhymHt::getRs()
+{
+    return this->map;
+}

sncprojects/lib/WSWool/respgetfinishedinfo.h → sncprojects/lib/WSWool/respgetfhymht.h

@@ -1,12 +1,12 @@
-#ifndef RESPGETFINISHEDINFO_H
-#define RESPGETFINISHEDINFO_H
+#ifndef RESPGETFHYMHT_H
+#define RESPGETFHYMHT_H
 #include <QtCore>
 #include "WSWool_global.h"
 
-class WSWOOLSHARED_EXPORT RespGetFinishedInfo
+class WSWOOLSHARED_EXPORT RespGetFhymHt
 {
 public:
-    RespGetFinishedInfo(QString json);
+    RespGetFhymHt(QString json);
     int getRtnCode();
     QString getRtnMemo();
     int getRsCount();
@@ -19,4 +19,4 @@ private:
     int rsCount;
 };
 
-#endif // RESPGETFINISHEDINFO_H
+#endif // RESPGETFHYMHT_H

sncprojects/lib/WSWool/respgetfhymtask.cpp

@@ -0,0 +1,120 @@
+#include "respgetfhymtask.h"
+#include <QScriptValue>
+#include <QScriptEngine>
+#include <QScriptValueIterator>
+RespGetFhymTask::RespGetFhymTask(QString json)
+{
+    this->json = json;
+    QScriptEngine engine;
+    QScriptValue sv = engine.evaluate("value = " + this->json);
+    QScriptValueIterator it(sv);
+    if(json.isEmpty())
+    {
+        rtnCode = RTNCODE_NETWORK_NOTAVAILABLE;
+        rtnMemo = RTNMEMO_NETWORK_NOTAVAILABLE;
+    }
+    else if(json=="ABORT")
+    {
+        rtnCode = RTNCODE_NETWORK_ABORT;
+        rtnMemo = RTNMEMO_NETWORK_ABORT;
+    }
+    else
+    {
+        rtnCode = RTNCODE_INVALID_FORMAT;
+        rtnMemo = RTNMEMO_INVALID_FORMAT;
+        while (it.hasNext())
+        {
+            it.next();
+            if(it.name()=="rtnCode")
+            {
+                this->rtnCode = it.value().toInt32();
+            }
+            else if(it.name()=="rtnMemo")
+            {
+                this->rtnMemo = it.value().toString();
+            }
+            else if(it.name()=="rsCount")
+            {
+                this->rsCount = it.value().toInt32();
+            }
+            else if(it.name()=="rs")
+            {
+                QScriptValueIterator it2(it.value());
+                while(it2.hasNext()) {
+                    it2.next();
+                    if (it2.flags() & QScriptValue::SkipInEnumeration)
+                        continue;
+
+                    QScriptValue sv1 = it2.value();
+
+                    if (sv1.property("taskid").toInt32() > 0) {
+                        map.insert("serialnum",sv1.property("serialnum").toString());
+                        map.insert("taskid",sv1.property("taskid").toString());
+                        map.insert("usercode",sv1.property("usercode").toString());
+                        map.insert("pnumfiletype",sv1.property("pnumfiletype").toString());
+                        map.insert("origfilename",sv1.property("origfilename").toString());
+                        map.insert("hmzs",sv1.property("hmzs").toString());
+                        map.insert("feecount",sv1.property("fee_count").toString());
+                        map.insert("createtime",sv1.property("create_time").toString());
+                        map.insert("finishtime",sv1.property("finish_time").toString());
+                        map.insert("state",sv1.property("state").toString());
+                        map.insert("statestr",sv1.property("statestr").toString());
+                        map.insert("price",sv1.property("price").toString());
+                        map.insert("duefee",sv1.property("duefee").toString());
+                        if(sv1.property("settlefee").toString()=="null")
+                            map.insert("settlefee","");
+                        else
+                            map.insert("settlefee",sv1.property("settlefee").toString());
+                        map.insert("giftfee",sv1.property("giftfee").toString());
+                        map.insert("memo",sv1.property("memo").toString());
+                    }
+                }
+            }
+            else
+            {
+                /*
+                QScriptValue sv1 = it.value();
+                if (sv1.property("taskid").toInt32() > 0)
+                {
+                    map.insert("serialnum",sv1.property("serialnum").toString());
+                    map.insert("taskid",sv1.property("taskid").toString());
+                    map.insert("usercode",sv1.property("usercode").toString());
+                    map.insert("pnumfiletype",sv1.property("pnumfiletype").toString());
+                    map.insert("origfilename",sv1.property("origfilename").toString());
+                    map.insert("hmzs",sv1.property("hmzs").toString());
+                    map.insert("feecount",sv1.property("fee_count").toString());
+                    map.insert("createtime",sv1.property("create_time").toString());
+                    map.insert("finishtime",sv1.property("finish_time").toString());
+                    map.insert("state",sv1.property("state").toString());
+                    map.insert("statestr",sv1.property("statestr").toString());
+                    map.insert("price",sv1.property("price").toString());
+                    map.insert("duefee",sv1.property("duefee").toString());
+                    if(sv1.property("settlefee").toString()=="null")
+                        map.insert("settlefee","");
+                    else
+                        map.insert("settlefee",sv1.property("settlefee").toString());
+                    map.insert("giftfee",sv1.property("giftfee").toString());
+                    map.insert("memo",sv1.property("memo").toString());
+                }
+                */
+            }
+        }
+    }
+}
+
+int RespGetFhymTask::getRtnCode()
+{
+    return this->rtnCode;
+}
+QString RespGetFhymTask::getRtnMemo()
+{
+    return this->rtnMemo;
+}
+int RespGetFhymTask::getRsCount()
+{
+    return this->rsCount;
+}
+QMultiMap<QString,QString> RespGetFhymTask::getRs()
+{
+    return this->map;
+}

sncprojects/lib/WSWool/respgetdealinfo.h → sncprojects/lib/WSWool/respgetfhymtask.h

@@ -1,12 +1,12 @@
-#ifndef RESPGETDEALINFO_H
-#define RESPGETDEALINFO_H
+#ifndef RESPGETFHYMTASK_H
+#define RESPGETFHYMTASK_H
 #include <QtCore>
 #include "WSWool_global.h"
 
-class WSWOOLSHARED_EXPORT RespGetDealInfo
+class WSWOOLSHARED_EXPORT RespGetFhymTask
 {
 public:
-    RespGetDealInfo(QString json);
+    RespGetFhymTask(QString json);
     int getRtnCode();
     QString getRtnMemo();
     int getRsCount();
@@ -20,4 +20,4 @@ private:
 };
 
 
-#endif // RESPGETDEALINFO_H
+#endif // RESPGETFHYMTASK_H

sncprojects/lib/WSWool/respgetfinishedinfo.cpp

@@ -1,80 +0,0 @@
-#include "respgetfinishedinfo.h"
-#include <QScriptValue>
-#include <QScriptEngine>
-#include <QScriptValueIterator>
-RespGetFinishedInfo::RespGetFinishedInfo(QString json)
-{
-    this->json = json;
-    QScriptEngine engine;
-    QScriptValue sv = engine.evaluate("value = " + this->json);
-    QScriptValueIterator it(sv);
-    if(json.isEmpty())
-    {
-        rtnCode = RTNCODE_NETWORK_NOTAVAILABLE;
-        rtnMemo = RTNMEMO_NETWORK_NOTAVAILABLE;
-    }
-    else if(json=="ABORT")
-    {
-        rtnCode = RTNCODE_NETWORK_ABORT;
-        rtnMemo = RTNMEMO_NETWORK_ABORT;
-    }
-    else
-    {
-        rtnCode = RTNCODE_INVALID_FORMAT;
-        rtnMemo = RTNMEMO_INVALID_FORMAT;
-        while (it.hasNext())
-        {
-            it.next();
-            if(it.name()=="rtnCode")
-            {
-                this->rtnCode = it.value().toInt32();
-            }
-            else if(it.name()=="rtnMemo")
-            {
-                this->rtnMemo = it.value().toString();
-            }
-            else if(it.name()=="rsCount")
-            {
-                this->rsCount = it.value().toInt32();
-            }
-            else
-            {
-                QScriptValue sv1 = it.value();
-                map.insert("serialnum",sv1.property("serialnum").toString());
-                map.insert("batchid",sv1.property("batchid").toString());
-                map.insert("batchtype",sv1.property("batchtype").toString());
-                map.insert("detail",sv1.property("detail").toString());
-                map.insert("resulttj",sv1.property("resulttj").toString());
-                map.insert("usercode",sv1.property("usercode").toString());
-                map.insert("submittime",sv1.property("submittime").toString());
-                map.insert("finishtime",sv1.property("finishtime").toString());
-                map.insert("settlefee",sv1.property("settlefee").toString());
-                map.insert("giftfee",sv1.property("giftfee").toString());
-                map.insert("numcount",sv1.property("numcount").toString());
-                map.insert("dlcount",sv1.property("dlcount").toString());
-                map.insert("finishcount",sv1.property("finishcount").toString());
-                map.insert("optstatus",sv1.property("optstatus").toString());
-                map.insert("ispass",sv1.property("ispass").toString());
-                map.insert("isdeliver",sv1.property("isdeliver").toString());
-                map.insert("delivertime",sv1.property("delivertime").toString());
-            }
-        }
-    }
-
-}
-int RespGetFinishedInfo::getRtnCode()
-{
-    return this->rtnCode;
-}
-QString RespGetFinishedInfo::getRtnMemo()
-{
-    return this->rtnMemo;
-}
-int RespGetFinishedInfo::getRsCount()
-{
-    return this->rsCount;
-}
-QMultiMap<QString,QString> RespGetFinishedInfo::getRs()
-{
-    return this->map;
-}

sncprojects/lib/WSWool/respgetsysparam.cpp

@@ -51,7 +51,6 @@ RespGetSysParam::RespGetSysParam(QString json)
             }
         }
     }
-
 }
 int RespGetSysParam::getRtnCode()
 {

sncprojects/lib/WSWool/resppacktran.cpp

@@ -35,7 +35,6 @@ RespPackTran::RespPackTran(QString json)
             }
         }
     }
-
 }
 int RespPackTran::getRtnCode()
 {

sncprojects/lib/WSWool/respsubminpnum.cpp → sncprojects/lib/WSWool/respsubmitfhymfile.cpp

@@ -1,9 +1,9 @@
-#include "respsubminpnum.h"
+#include "respsubmitfhymfile.h"
 #include <QScriptValue>
 #include <QScriptEngine>
 #include <QScriptValueIterator>
 
-RespSubminPNum::RespSubminPNum(QString json)
+RespSubmitFhymFile::RespSubmitFhymFile(QString json)
 {
     this->json = json;
     QScriptEngine engine;
@@ -34,11 +34,11 @@ RespSubminPNum::RespSubminPNum(QString json)
             {
                 this->rtnMemo = it.value().toString();
             }
-            else if(it.name()=="batchid")
+            else if(it.name()=="taskid")
             {
-                this->batchid = it.value().toString();
+                this->taskid = it.value().toString();
             }
-            else if(it.name()=="submittime")
+            else if(it.name()=="inserttime")
             {
                 this->submitTime = it.value().toString();
             }
@@ -49,24 +49,24 @@ RespSubminPNum::RespSubminPNum(QString json)
         }
     }
 }
-int RespSubminPNum::getRtnCode()
+int RespSubmitFhymFile::getRtnCode()
 {
     return this->rtnCode;
 }
-QString RespSubminPNum::getRtnMemo()
+QString RespSubmitFhymFile::getRtnMemo()
 {
     return this->rtnMemo;
 }
-int RespSubminPNum::getSubmitNum()
+int RespSubmitFhymFile::getSubmitNum()
 {
     return this->submitNum;
 }
 
-QString RespSubminPNum::getSubmitTime()
+QString RespSubmitFhymFile::getSubmitTime()
 {
     return this->submitTime;
 }
-QString RespSubminPNum::getBatchID()
+QString RespSubmitFhymFile::getTaskID()
 {
-    return this->batchid;
+    return this->taskid;
 }

sncprojects/lib/WSWool/respsubminpnum.h → sncprojects/lib/WSWool/respsubmitfhymfile.h

@@ -1,26 +1,26 @@
-#ifndef RESPSUBMINPNUM_H
-#define RESPSUBMINPNUM_H
+#ifndef RESPSUBMITFHYMFILE_H
+#define RESPSUBMITFHYMFILE_H
 #include <QtCore>
 #include "WSWool_global.h"
 
-class WSWOOLSHARED_EXPORT RespSubminPNum
+class WSWOOLSHARED_EXPORT RespSubmitFhymFile
 {
 public:
-    RespSubminPNum(QString json);
+    RespSubmitFhymFile(QString json);
     int getRtnCode();
     QString getRtnMemo();
-    QString getBatchID();
+    QString getTaskID();
     int getSubmitNum();
     QString getSubmitTime();
 private:
     QString json;
     int rtnCode;
     QString rtnMemo;
-    QString batchid;
+    QString taskid;
     QString submitTime;
     int submitNum;
 
 };
 
 
-#endif // RESPSUBMINPNUM_H
+#endif // RESPSUBMITFHYMFILE_H

sncprojects/lib/WSWool/respchkuserfeestatus.cpp → sncprojects/lib/WSWool/respuserserviceverify.cpp

@@ -1,15 +1,14 @@
-#include "respchkuserfeestatus.h"
+#include "respuserserviceverify.h"
 #include <QScriptValue>
 #include <QScriptEngine>
 #include <QScriptValueIterator>
-RespChkUserFeeStatus::RespChkUserFeeStatus(QString json)
+
+RespUserServiceVerify::RespUserServiceVerify(QString json)
 {
     this->json = json;
     QScriptEngine engine;
     QScriptValue sv = engine.evaluate("value = " + this->json);
     QScriptValueIterator it(sv);
-
-    this->rtnMemo = "";
     if(json.isEmpty())
     {
         rtnCode = RTNCODE_NETWORK_NOTAVAILABLE;
@@ -37,12 +36,19 @@ RespChkUserFeeStatus::RespChkUserFeeStatus(QString json)
             }
         }
     }
+
 }
-int RespChkUserFeeStatus::getRtnCode()
+int RespUserServiceVerify::getRtnCode()
 {
     return this->rtnCode;
 }
-QString RespChkUserFeeStatus::getRtnMemo()
+QString RespUserServiceVerify::getRtnMemo()
 {
     return this->rtnMemo;
 }
+
+QString RespUserServiceVerify::getRtnParaList()
+{
+    return this->rtnParaList;
+}
+

sncprojects/lib/WSWool/respuserserviceverify.h

@@ -0,0 +1,21 @@
+#ifndef RESPUSERSERVICEVERIFY_H
+#define RESPUSERSERVICEVERIFY_H
+
+#include <QtCore>
+#include "WSWool_global.h"
+
+class WSWOOLSHARED_EXPORT RespUserServiceVerify
+{
+public:
+    RespUserServiceVerify(QString json);
+    int getRtnCode();
+    QString getRtnMemo();
+    QString getRtnParaList();
+private:
+    int rtnCode;
+    QString rtnMemo;
+    QString json;
+    QString rtnParaList;
+};
+
+#endif // RESPUSERSERVICEVERIFY_H

sncprojects/lib/WSWool/wswool.cpp

@@ -20,7 +20,7 @@ QString WSWool::GetSysParam(QString src, QString authCode)
 }
 
 //分包传送文件
-QString WSWool::PackTran(QString packName,QString userHash)
+QString WSWool::PackTran(QString packName, QString userHash)
 {
     WOOL wool;
     connect(this,SIGNAL(canceled()),&wool,SLOT(onCanceled()));
@@ -95,13 +95,13 @@ QString WSWool::SubmitfhymFile(QString fileName, QString fileType, QString memo,
     file.close();
 
     QTextCodec *codec = QTextCodec::codecForLocale();
-    // QString fileName_utf8 = codec->toUnicode(fileName.toLocal8Bit());
-    QString fileName_utf8 = codec->toUnicode(fileinfo.fileName().toLocal8Bit());
+    QString fileName_utf8 = codec->toUnicode(fileName.toLocal8Bit());
+    // QString fileName_utf8 = codec->toUnicode(fileinfo.fileName().toLocal8Bit());
     QString fcEncodeType = "BASE64";
     QString src = "1";    //来源 1:魔方 2:网页平台
     QString dealstate = "0";   //0:立即开始 1:手动开始
 
-    QString str = "{fileName:%1, fileContent:%2, fcEncodeType:%3, fileType:%4, memo:%5, src:%6, dealstate:%7}";
+    QString str = "{\"fileName\":\"%1\", \"fileContent\":\"%2\", \"fcEncodeType\":\"%3\", \"fileType\":\"%4\", \"memo\":\"%5\", \"src\":\"%6\", \"dealstate\":\"%7\"}";
     QString params = str.arg(fileName_utf8).arg(fileContent).arg(fcEncodeType).arg(fileType).arg(memo).arg(src).arg(dealstate);
 
     return wool.SubmitfhymFile(params, userHash);
@@ -119,7 +119,7 @@ QString WSWool::SubmitfhymFile(QString fileName, QString fileHash, QString fileT
     QString src = "1";    //来源 1:魔方 2:网页平台
     QString dealstate = "0";   //0:立即开始 1:手动开始
 
-    QString str = "{fileName:%1, fileContent:%2, fcEncodeType:%3, fileType:%4, memo:%5, src:%6, dealstate:%7}";
+    QString str = "{\"fileName\":\"%1\", \"fileContent\":\"%2\", \"fcEncodeType\":\"%3\", \"fileType\":\"%4\", \"memo\":\"%5\", \"src\":\"%6\", \"dealstate\":\"%7\"}";
     QString params = str.arg(fileName_utf8).arg(fileHash).arg(fcEncodeType).arg(fileType).arg(memo).arg(src).arg(dealstate);
 
     return wool.SubmitfhymFile(params, userHash);
@@ -147,7 +147,7 @@ QString WSWool::GetfhymHt(int indate, QString userHash)
     WOOL wool;
     connect(this,SIGNAL(canceled()),&wool,SLOT(onCanceled()));
 
-    QString str = "{indate:%1}";
+    QString str = "{\"indate\":\"%1\"}";
     QString params = str.arg(indate);
 
     return wool.GetfhymHt(params, userHash);
@@ -167,7 +167,7 @@ QString WSWool::GetChargeInfo(QString dateStart, QString dateEnd, QString userHa
     WOOL wool;
     connect(this,SIGNAL(canceled()),&wool,SLOT(onCanceled()));
 
-    QString str = "{dateStart:%1, dateEnd:%2}";
+    QString str = "{\"dateStart\":\"%1\", \"dateEnd\":\"%2\"}";
     QString params = str.arg(dateStart).arg(dateEnd);
 
     return wool.GetChargeInfo(params, userHash);
@@ -179,7 +179,7 @@ QString WSWool::GetCostInfo(QString dateStart, QString dateEnd, QString userHash
     WOOL wool;
     connect(this,SIGNAL(canceled()),&wool,SLOT(onCanceled()));
 
-    QString str = "{dateStart:%1, dateEnd:%2}";
+    QString str = "{\"dateStart\":\"%1\", \"dateEnd\":\"%2\"}";
     QString params = str.arg(dateStart).arg(dateEnd);
 
     return wool.GetCostInfo(params, userHash);

sncprojects/lib/WSWool/wswool.h

@@ -15,7 +15,7 @@ public:
     QString GetSysParam(QString src, QString authCode);
 
     //롸관눈箇匡숭
-    QString PackTran(QString packName,QString userHash);
+    QString PackTran(QString packName, QString userHash);
 
     //롸관匡숭憐북
     QString PackMerge(QString packName, QString userHash);

sncprojects/res/resource.qrc

@@ -22,6 +22,7 @@
 	<file alias="newnumber.gif">images/toolbar/newnumber.gif</file>
 	<file alias="new-number.png">images/toolbar/new-number.png</file>
 	<file alias="zxsh.png">images/toolbar/zxsh.png</file>
+	<file alias="wool.png">images/toolbar/wool.png</file>
 	<file alias="upgradeok.jpg">images/upgrade/upgradeok.jpg</file>
 	<file alias="upgradeerror.jpg">images/upgrade/upgradeerror.jpg</file>
 	<file alias="upgradewarning.jpg">images/upgrade/upgradewarning.jpg</file>

sncprojects/sncprojects.pro

@@ -18,6 +18,8 @@ SUBDIRS += lib/sncdatabase\
            app/speednumcube\
            app/SetupSegment\
            app/snc_db_tool \
-           app/testui
+           app/testui \
+    lib/SNCWool \
+    lib/WSWool
 
 

sncprojects/sncprojects.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.1, 2019-06-03T15:29:52. -->
+<!-- Written by Qt Creator 2.6.1, 2019-07-25T17:19:52. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>