admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VNOG#81951 Optimaliseren MLD2BES -integratie (afleveradres)

Browse Source 
svn path=/Website/trunk/; revision=64469
This commit is contained in:
Erik Groener
2024-05-01 10:50:12 +00:00
parent 8535dcb849
commit aac71a1639
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/BES/bes_edit_bestelling.asp
View File

@@ -247,6 +247,7 @@ else // nieuwe bestelling. Defaults bepalen
+ ", m.prs_kostenplaats_key"
+ ", sd.ins_srtdiscipline_prefix mld_prefix"
+ ", m.mld_adres_key"
+ ", m.mld_alg_locatie_key"
+ " FROM mld_melding m"
+ ", prs_perslid p"
+ ", mld_stdmelding sm"
@@ -262,6 +263,7 @@ else // nieuwe bestelling. Defaults bepalen
bes_bestelling.mld_prefix = oRs("mld_prefix").value;
bes_bestelling.mld_adres_key = oRs("mld_adres_key").value;
bes_bestelling.alg_locatie_key = oRs("mld_alg_locatie_key").Value || -1;
bes_bestelling.perslid_key = oRs("prs_perslid_key").value;
bes_bestelling.perslid_key_voor = oRs("prs_perslid_key").value;
bes_bestelling.kostenplaats_key = oRs("prs_kostenplaats_key").value || -1;
@@ -827,6 +829,7 @@ oRs.Close();
{ trid: "deliveryaddress",
label: L("lcl_delivery_address"),
adresKey: bes_bestelling.mld_adres_key,
locKey: bes_bestelling.alg_locatie_key,
emptyOption: "",
filtercode: "A",
autlevel: ALGreadlevel,
@@ -839,6 +842,7 @@ oRs.Close();
+ " , m.mld_adres_naam"
+ " FROM mld_adres m"
+ " WHERE mld_adres_verwijder IS NULL"
+ (bes_bestelling.alg_locatie_key > -1 ? " AND m.alg_locatie_key = " + bes_bestelling.alg_locatie_key : "")
+ filtClause
+ " ORDER BY m.mld_adres_key";
var oRs = Oracle.Execute(sql_ad);

24
APPL/Shared/adresselector.inc
View File

@@ -53,7 +53,26 @@ function FCLTadresselector(fieldName, objectName, params)
if (!oRs.eof)
{
ladresName = oRs("adres").Value;
lextraInit = oRs("extra").Value
lextraInit = oRs("extra").Value;
}
oRs.Close();
}
if (params.locKey && params.locKey > 0 && !(params.adresKey && params.adresKey > 0))
{
var filtClause = getFiltClauseAdres(params.filtercode);
var sql = "SELECT m.mld_adres_key"
+ " , m.mld_adres_naam adres"
+ " , 'dummy' extra"
+ " FROM mld_adres m"
+ " WHERE m.alg_locatie_key = " + params.locKey
+ filtClause
+ " ORDER BY m.mld_adres_key";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
params.adresKey = oRs("mld_adres_key").Value;
ladresName = oRs("adres").Value;
lextraInit = oRs("extra").Value;
}
oRs.Close();
}
@@ -62,7 +81,8 @@ function FCLTadresselector(fieldName, objectName, params)
var compQueryUrl = rooturl + "/appl/shared/suggest/SuggestAdres.asp"
+ ((typeof params.autlevel != "undefined")? "?autlevel=" + params.autlevel : "?autlevel=-1")
+ (params.filtercode? "&filtcode=" + params.filtercode : "")
+ (params.extracode? "&extracode=" + params.extracode : "");
+ (params.extracode? "&extracode=" + params.extracode : "")
+ (params.locatie? "&locatie=" + params.locatie : "");
if (params.label)
{ %><tr <%=params.trid?"id='"+params.trid+"' ":""%><%=params.trclass?"class='"+params.trclass+"'":""%>>
<td class="label">