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

KFNS#38873 technisch adres kan nu ook aan (evt. alleen) district worden gekoppelt

Browse Source 
svn path=/Website/trunk/; revision=32737
This commit is contained in:
Koen Reefman
2017-02-08 09:31:10 +00:00
parent 01da0288a1
commit 6a1db2fa9a
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
UTILS/PutOrders/puo_allorders.js
View File

@@ -24,7 +24,7 @@ function sendAllOrders()
{
sql += " UNION"
+ " SELECT prs_bedrijf_key,"
+ " alg_locatie_key,"
+ " alg_locatie_key,"
+ " xmlnode,"
+ " key,"
+ " reference,"
@@ -46,13 +46,13 @@ function sendAllOrders()
__Log("Opening order query")
while (!oRs.Eof)
{
var Bedrijf_key = oRs("prs_bedrijf_key").value;
var prs_loc_key = oRs("alg_locatie_key").value;
var XMLnode = oRs("xmlnode").value;
var OpdrKey = oRs("key").value;
var ordernr = oRs("reference").value;
var Sender = oRs("Sender").value||"";
var cust = oRs("cust").value;
var Bedrijf_key = oRs("prs_bedrijf_key").value;
var prs_loc_key = oRs("alg_locatie_key").value;
var XMLnode = oRs("xmlnode").value;
var OpdrKey = oRs("key").value;
var ordernr = oRs("reference").value;
var Sender = oRs("Sender").value||"";
var cust = oRs("cust").value;
if (send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender, cust))
{
@@ -118,7 +118,11 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
+ " ba.prs_bedrijfadres_soapaction"
+ " FROM prs_bedrijfadres ba "
+ " WHERE ba.prs_bedrijf_key = " + Bedrijf_key
+ " AND ((ba.alg_locatie_key = " + prs_loc_key + ") OR (ba.alg_locatie_key IS NULL))";
+ " AND ((ba.alg_locatie_key = " + prs_loc_key + ") OR (ba.alg_locatie_key IS NULL))"
+ " AND (ba.alg_district_key = (SELECT d.alg_district_key"
+ " FROM alg_locatie d"
+ " WHERE d.alg_locatie_key = " + prs_loc_key + ")"
+ " OR (ba.alg_district_key IS NULL))";
switch (XMLnode)
{
@@ -134,7 +138,7 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
if (!oRsOT.Eof)
{
sqlB += " AND (ba.mld_typeopdr_key = " + oRsOT("mld_typeopdr_key").value + " OR ba.mld_typeopdr_key IS NULL)"
+ " ORDER BY mld_typeopdr_key NULLS LAST, ba.alg_locatie_key NULLS LAST"; // bedoeling: de gevulde specifieke boven de lege fallback
+ " ORDER BY mld_typeopdr_key NULLS LAST, ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST"; // bedoeling: de gevulde specifieke boven de lege fallback
}
else
{
@@ -146,13 +150,13 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender,
case "bestelopdr":
{
sqlB += " AND prs_bedrijfadres_type = 'B'";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST";
break;
}
case "contract":
{
sqlB += " AND prs_bedrijfadres_type = 'C'";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST";
sqlB += " ORDER BY ba.alg_locatie_key NULLS LAST, ba.alg_district_key NULLS LAST";
break;
}
default: