Commit e2576f3d by xiaoqing.gu

全部pos更新添加partnerId筛选项

parent 497a11b2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2017-11-29T14:46:43. --> <!-- Written by QtCreator 3.5.1, 2017-12-21T10:57:59. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
......
...@@ -1343,6 +1343,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1343,6 +1343,7 @@ void MainWindow::on_FullInformationBtn_clicked()
QObject::disconnect(ui->tableWidget,SIGNAL(cellChanged(int,int)),this,SLOT(slotCellChanged(int,int))); QObject::disconnect(ui->tableWidget,SIGNAL(cellChanged(int,int)),this,SLOT(slotCellChanged(int,int)));
QString text = ui->posStateCB->currentText(); QString text = ui->posStateCB->currentText();
int partId = ui->PlanNameLe->text().toInt();
QSqlQueryModel *model = new QSqlQueryModel; QSqlQueryModel *model = new QSqlQueryModel;
if(text == "全部") if(text == "全部")
{ {
...@@ -1354,7 +1355,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1354,7 +1355,7 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE 1=1 ")); "WHERE ts.PartnerId = %1 ").arg(partId));
model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
...@@ -1364,7 +1365,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1364,7 +1365,7 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE 1=1 ")); "WHERE ts.PartnerId = %1 ").arg(partId));
} }
else if(text == "待更新") else if(text == "待更新")
{ {
...@@ -1376,7 +1377,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1376,7 +1377,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 0 ")); "WHERE tu.Updatestate = 0 "
"AND ts.PartnerId = %1 ").arg(partId));
model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
...@@ -1386,7 +1388,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1386,7 +1388,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 0 ")); "WHERE tu.Updatestate = 0 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else if(text == "正在更新") else if(text == "正在更新")
{ {
...@@ -1398,7 +1401,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1398,7 +1401,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 1 ")); "WHERE tu.Updatestate = 1 "
"AND ts.PartnerId = %1 ").arg(partId));
model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
...@@ -1408,7 +1412,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1408,7 +1412,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 1 ")); "WHERE tu.Updatestate = 1 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else if(text == "已下发") else if(text == "已下发")
{ {
...@@ -1420,7 +1425,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1420,7 +1425,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 2 ")); "WHERE tu.Updatestate = 2 "
"AND ts.PartnerId = %1 ").arg(partId));
model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," model->setQuery(QObject::tr("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
"isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo " "isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo "
...@@ -1429,7 +1435,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1429,7 +1435,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 2 ")); "WHERE tu.Updatestate = 2 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else else
{ {
...@@ -1441,7 +1448,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1441,7 +1448,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = -1 ")); "WHERE tu.Updatestate = -1 "
"AND ts.PartnerId = %1 ").arg(partId));
...@@ -1453,7 +1461,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1453,7 +1461,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = -1 ")); "WHERE tu.Updatestate = -1 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
ui->tableView->setModel(model); ui->tableView->setModel(model);
...@@ -1495,7 +1504,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1495,7 +1504,7 @@ void MainWindow::on_FullInformationBtn_clicked()
ui->tableWidget->horizontalHeader()->setSectionResizeMode(7, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(7, QHeaderView::ResizeToContents);
ui->tableWidget->horizontalHeader()->setSectionResizeMode(8, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(8, QHeaderView::ResizeToContents);
ui->tableWidget->horizontalHeader()->setSectionResizeMode(9, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(9, QHeaderView::ResizeToContents);
ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows); // ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft); ui->tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers); ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
} }
...@@ -1509,6 +1518,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1509,6 +1518,7 @@ void MainWindow::on_FullInformationBtn_clicked()
ui->EnablePlanBtn->setEnabled(false); ui->EnablePlanBtn->setEnabled(false);
ui->ImplementBtn->setEnabled(true); ui->ImplementBtn->setEnabled(true);
QString text = ui->posStateCB->currentText(); QString text = ui->posStateCB->currentText();
int partId = ui->PlanNameLe->text().toInt();
if(text == "全部") if(text == "全部")
{ {
ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
...@@ -1523,7 +1533,7 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1523,7 +1533,7 @@ void MainWindow::on_FullInformationBtn_clicked()
} }
else if(text == "待更新") else if(text == "待更新")
{ {
ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," ui->SQLTe->setText(QString("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
"isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo " "isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo "
"FROM tPos AS tp (NOLOCK) " "FROM tPos AS tp (NOLOCK) "
...@@ -1531,11 +1541,12 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1531,11 +1541,12 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 0 "); "WHERE tu.Updatestate = 0 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else if(text == "正在更新") else if(text == "正在更新")
{ {
ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," ui->SQLTe->setText(QString("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
"isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo " "isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo "
"FROM tPos AS tp (NOLOCK) " "FROM tPos AS tp (NOLOCK) "
...@@ -1543,11 +1554,12 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1543,11 +1554,12 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 1 "); "WHERE tu.Updatestate = 1 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else if(text == "已下发") else if(text == "已下发")
{ {
ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," ui->SQLTe->setText(QString("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
"isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo " "isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo "
"FROM tPos AS tp (NOLOCK) " "FROM tPos AS tp (NOLOCK) "
...@@ -1555,11 +1567,12 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1555,11 +1567,12 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = 2 "); "WHERE tu.Updatestate = 2 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
else else
{ {
ui->SQLTe->setText("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer," ui->SQLTe->setText(QString("SELECT ts.ID as StoreID,ts.StoreID as StoreNO,tp.ID as '自增POS ID', tp.PosNO,tp.LastHeartbeatTime,tp.UpdateVer,"
"(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus," "(case tu.Updatestate when 1 then '正在更新' when 2 then '已下发' when -1 then '更新失败' else '待更新' end) as UpdateStatus,"
"isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo " "isnull(CONVERT (varchar(20), tu.planid),'未安排') as planid,tp.[Enable],tu.memo AS Memo "
"FROM tPos AS tp (NOLOCK) " "FROM tPos AS tp (NOLOCK) "
...@@ -1567,7 +1580,8 @@ void MainWindow::on_FullInformationBtn_clicked() ...@@ -1567,7 +1580,8 @@ void MainWindow::on_FullInformationBtn_clicked()
"ON tp.StoreID=ts.ID " "ON tp.StoreID=ts.ID "
"LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) " "LEFT JOIN [Freemud_PosUpgrade].[dbo].tUpdateIPList tu (NOLOCK) "
"ON tp.ID=tu.posid " "ON tp.ID=tu.posid "
"WHERE tu.Updatestate = -1 "); "WHERE tu.Updatestate = -1 "
"AND ts.PartnerId = %1 ").arg(partId));
} }
} }
} }
...@@ -1949,7 +1963,7 @@ void MainWindow::on_PartInformationBtn_clicked() ...@@ -1949,7 +1963,7 @@ void MainWindow::on_PartInformationBtn_clicked()
ui->tableWidget->horizontalHeader()->setSectionResizeMode(7, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(7, QHeaderView::ResizeToContents);
ui->tableWidget->horizontalHeader()->setSectionResizeMode(8, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(8, QHeaderView::ResizeToContents);
ui->tableWidget->horizontalHeader()->setSectionResizeMode(9, QHeaderView::ResizeToContents); ui->tableWidget->horizontalHeader()->setSectionResizeMode(9, QHeaderView::ResizeToContents);
ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows); // ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft); ui->tableWidget->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers); ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment