Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Report WH

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-12-24 17:24:01 +03:00
parent bfe586ee2e
commit a06f7653c5
6 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LibDataBaseInterface/databaselms_tasks_fim.cpp
View File

@@ -431,7 +431,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
//Выгребаем отчет для этой задачи
int report_id = 0;
queryStr = QString("SELECT reports.report_id "
queryStr = QString("SELECT reports.report_id, reports.mmel "
"FROM public.reports "
"WHERE fk_task_fim_id = %1 "
"ORDER BY reports.report_id ASC").arg(
@@ -445,6 +445,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
{//Отчет
report_id = queryReport.value(0).toInt();
task.report.id = report_id;
task.report.mmel = queryReport.value(1).toBool();
}
}
else
@@ -490,7 +491,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
//Выгребаем все wh_item отчета
queryStr = QString("SELECT report_wh_items.wh_item_id, report_wh_items.status, report_wh_items.go_name, report_wh_items.obj_name, report_wh_items.fk_report_id, report_wh_items.number "
queryStr = QString("SELECT report_wh_items.wh_item_id, report_wh_items.status, report_wh_items.go_name, report_wh_items.obj_name, report_wh_items.code, report_wh_items.fk_report_id, report_wh_items.number "
"FROM public.report_wh_items "
"WHERE fk_report_id = %1 "
"ORDER BY report_wh_items.number ASC").arg(
@@ -507,6 +508,7 @@ QList<TaskAmmFim> DataBaseLMS::selectTasksFIMofTrainee(int id_trainee)
reportWhItem.status = queryWhItems.value(1).toInt();
reportWhItem.goName = queryWhItems.value(2).toString();
reportWhItem.objName = queryWhItems.value(3).toString();
reportWhItem.code = queryWhItems.value(4).toString();
task.report.warehouseItemList.append(reportWhItem);
}
@@ -618,7 +620,7 @@ TaskAmmFim DataBaseLMS::selectTaskFIMbyID(int id_task)
//Выгребаем отчет для этой задачи
int report_id = 0;
queryStr = QString("SELECT reports.report_id "
queryStr = QString("SELECT reports.report_id, reports.mmel "
"FROM public.reports "
"WHERE fk_task_fim_id = %1 "
"ORDER BY reports.report_id ASC").arg(
@@ -632,6 +634,7 @@ TaskAmmFim DataBaseLMS::selectTaskFIMbyID(int id_task)
{//Отчет
report_id = queryReport.value(0).toInt();
task.report.id = report_id;
task.report.mmel = queryReport.value(1).toBool();
}
}
else
@@ -677,7 +680,7 @@ TaskAmmFim DataBaseLMS::selectTaskFIMbyID(int id_task)
//Выгребаем все wh_item отчета
queryStr = QString("SELECT report_wh_items.wh_item_id, report_wh_items.status, report_wh_items.go_name, report_wh_items.obj_name, report_wh_items.fk_report_id, report_wh_items.number "
queryStr = QString("SELECT report_wh_items.wh_item_id, report_wh_items.status, report_wh_items.go_name, report_wh_items.obj_name, report_wh_items.code, report_wh_items.fk_report_id, report_wh_items.number "
"FROM public.report_wh_items "
"WHERE fk_report_id = %1 "
"ORDER BY report_wh_items.number ASC").arg(
@@ -694,6 +697,7 @@ TaskAmmFim DataBaseLMS::selectTaskFIMbyID(int id_task)
reportWhItem.status = queryWhItems.value(1).toInt();
reportWhItem.goName = queryWhItems.value(2).toString();
reportWhItem.objName = queryWhItems.value(3).toString();
reportWhItem.code = queryWhItems.value(4).toString();
task.report.warehouseItemList.append(reportWhItem);
}
@@ -751,8 +755,8 @@ int DataBaseLMS::updateReportFIMforTask(TaskAmmFim task)
queryStr = QString("INSERT INTO public.reports (fk_task_fim_id, mmel) "
"VALUES (%1, %2) "
"RETURNING reports.report_id").arg(
task.getID(),
task.report.mmel);
QString::number(task.getID()),
(task.report.mmel ? "true" : "false"));
report_id = queryExecInt(queryStr);
if(!report_id)