root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : mr0
Commento            : Aggiornamento Campo/Compass query O01C


git-svn-id: svn://10.65.10.50/branches/R_10_00@23756 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2017-04-21 08:54:50 +00:00
parent 59b4119fbe
commit 93354dec55
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mr/mr0600.cpp
View File

@ -581,6 +581,10 @@ bool TCampass_app::o01c(const TString id) const
break; break;
rowRDoc = curRDoc.curr(); rowRDoc = curRDoc.curr();
rowRDist = curRDist.curr();
while (rowRDoc.get("CODART") != rowRDist.get("CODDIST"))
{
while(rowRDoc.get("CODART") < rowRDist.get("CODDIST")) while(rowRDoc.get("CODART") < rowRDist.get("CODDIST"))
{ {
++curRDoc; ++curRDoc;
@ -591,11 +595,8 @@ bool TCampass_app::o01c(const TString id) const
++curRDist; ++curRDist;
rowRDist = curRDist.curr(); rowRDist = curRDist.curr();
} }
}
if(rowRDoc.get("CODART") != rowRDist.get("CODDIST")) continue;
for(;rowRDoc.get("CODART") == rowRDist.get("CODDIST");)
{
// Filtro aggiuntivo // Filtro aggiuntivo
if(rowRDist.get("TIPO") == "A" && !rowRDoc.get_bool("RIGAEVASA")) if(rowRDist.get("TIPO") == "A" && !rowRDoc.get_bool("RIGAEVASA"))
{ {
@ -608,7 +609,7 @@ bool TCampass_app::o01c(const TString id) const
filtroFiltro.put("ANNO", rowRDoc.get("DAANNO")); filtroFiltro.put("ANNO", rowRDoc.get("DAANNO"));
filtroFiltro.put("PROVV", rowRDoc.get("DAPROVV")); filtroFiltro.put("PROVV", rowRDoc.get("DAPROVV"));
filtroFiltro.put("NDOC", rowRDoc.get("DANDOC")); filtroFiltro.put("NDOC", rowRDoc.get("DANDOC"));
//filtroFiltro.put("IDRIGA", rowRDoc.get("DAIDRIGA"));
TCursor curFiltro(&rdoc, "", 1, &filtroFiltro, &filtroFiltro); TCursor curFiltro(&rdoc, "", 1, &filtroFiltro, &filtroFiltro);
for (curFiltro = 0; curFiltro.pos() < curFiltro.items() && !p.is_cancelled(); ++curFiltro) for (curFiltro = 0; curFiltro.pos() < curFiltro.items() && !p.is_cancelled(); ++curFiltro)
{ {
@ -627,9 +628,6 @@ bool TCampass_app::o01c(const TString id) const
} }
} }
++curRDist;
rowRDist = curRDist.curr();
}
} }
return sqlset.commit() == -1 ? false : true; return sqlset.commit() == -1 ? false : true;