IVET#34563 -- AiAi in fac.nextcyclusdate

svn path=/Website/branches/v2015.3/; revision=27921
This commit is contained in:
Arthur Egberink
2016-01-26 12:59:03 +00:00
parent 153a29b109
commit c9ffdde105

View File

@@ -73,7 +73,7 @@ if (srtcontrole_key < 0)
+ " OR isc.ins_srtcontrole_niveau = 'D'"
+ " AND isc.ins_srtinstallatie_key = id.ins_discipline_key)"
+ " AND id.ins_deel_key = " + ins_key
+ (today != -1 ? " AND TRUNC(FAC.nextcyclusdate (id.ins_deel_key, isc.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) " : "")
+ (today != -1 ? " AND TRUNC(FAC.nextcyclusdatedeel (id.ins_deel_key, isc.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) " : "")
+ " GROUP BY id.ins_deel_omschrijving";
var oRs = Oracle.Execute(sql);
if (oRs.Eof) // er is niets over
@@ -157,7 +157,7 @@ if (srtcontrole_key < 0 || defaultmode_key > 0)
+ " ON i.ins_deel_key = xcp.ins_deel_key"
+ " AND i.ins_srtcontrole_key = xcp.ins_srtcontrole_key"
+ " WHERE COALESCE (ins_srtcontroledl_xcp_eenheid, ins_srtcontrole_eenheid) <> 0"
+ (today != -1 ? " AND TRUNC(FAC.nextcyclusdate (i.ins_deel_key, i.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) " : "");
+ (today != -1 ? " AND TRUNC(FAC.nextcyclusdatedeel (i.ins_deel_key, i.ins_srtcontrole_key, 1)) <= TRUNC(sysdate) " : "");
function fnPrefix(oRs, params)
{