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

DJIN#41675: DJIN - BES: Bevestiging levering/ontvangst door besteller va.

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37336
This commit is contained in:
Maykel Geerdink
2018-03-13 13:27:09 +00:00
parent ab3db9c63a
commit 38f56f8c46
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/BES/bes_opdr_confirm.asp
View File

@@ -41,6 +41,9 @@ for (var i = 0; i < ingesloten.length; i++)
{
// Status "Ontvangen(9)" zetten
bes.setbestellingstatus(ingesloten[i], 9); // Zet de status "Ontvangen(9)" en trackt zelf BESOT2.
// Tijdelijk: Gequeuede BESOT2 notificatie verwijderen voor 2017.3 omdat deze onterecht wordt verstuurd. In 2018.1 structueel oplossen.
var sql = "BEGIN fac.clrnotifications ('BESOT2', " + ingesloten[i] + "); END;";
Oracle.Execute(sql);
}
result = { close: true, success: true};

28
APPL/BES/opdr_delivery.asp
View File

@@ -115,11 +115,16 @@ user.auth_required_or_abort(this_bestelopdr.canDeliver);
// Laat de gevolgen bepalen..
bes.updatebestelopdrstatus(opdr_key);
// moet ik verdorie de bestelling_key nog speciaal ophalen..
sql = "SELECT bes_bestelling_key"
+ " FROM bes_bestelling_item"
+ " WHERE bes_bestelling_item_key = " + bikey;
sql = "SELECT bi.bes_bestelling_key"
+ " , b.prs_perslid_key_voor"
+ " FROM bes_bestelling_item bi"
+ " , bes_bestelling b"
+ " WHERE bi.bes_bestelling_key = b.bes_bestelling_key"
+ " AND bes_bestelling_item_key = " + bikey;
var oRs = Oracle.Execute(sql);
bes.updatebestellingstatus(oRs("bes_bestelling_key").value);
var bes_key = oRs("bes_bestelling_key").Value;
bes.updatebestellingstatus(bes_key);
var prs_voor = oRs("prs_perslid_key_voor").Value;
oRs.Close();
var newremark = getFParam("notsat", "");
@@ -136,6 +141,21 @@ user.auth_required_or_abort(this_bestelopdr.canDeliver);
opdr_key,
L("lcl_bes_is_bes2uptrack").format(S("bes_bestelopdr_prefix") + besopdr_id) + "\n" + trackarray.join("\n"));
// BESOT2 Notificaties sturen naar de prs_perslid_voor.
// This notification is now sent on behalf of the system, what might be the local FM organisation
var sql = "SELECT l.alg_locatie_email" // null as a string
+ " FROM mld_adres ma, alg_locatie l, bes_bestelling b"
+ " WHERE b.mld_adres_key_lev = ma.mld_adres_key"
+ " AND ma.alg_locatie_key = l.alg_locatie_key"
+ " AND b.bes_bestelling_key = " + bes_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
var lsender = oRs(0).Value;
else
var lsender = null;
Oracle.Execute("BEGIN fac.putnotificationsrtprio(NULL, " + prs_voor + ", 'BESOT2', " + bes_key + ", NULL, NULL, NULL, NULL, NULL, 2, " + (lsender ? safe.quoted_sql(lsender) : "NULL") + "); END;");
// Zijn er bijbehorende facturen die al zijn ingevoerd met de status "Ingevoerd(2)" die nog geapproved moeten worden?
bes.autoapprovefactuur(opdr_key);

1
APPL/Shared/status.inc
View File

@@ -183,6 +183,7 @@ var status = {
case "BESFIT" : tekst = L("lcl_bes_is_besfit") ; break;
case "BESINF" : tekst = L("lcl_bes_is_besinf") ; break;
case "BESOTV" : tekst = L("lcl_bes_is_besotv") ; break;
case "BESOT2" : tekst = 'Bestelling is bevestigd' ; break;
case "BESREJ" : tekst = L("lcl_bes_is_besrej") ; break;
case "BESUPD" : tekst = L("lcl_bes_is_besupd") ; break;
case "BESVER" : tekst = L("lcl_bes_is_besver") ; break;