diff --git a/UTILS/PutOrders/puo_allorders.js b/UTILS/PutOrders/puo_allorders.js index f3e41c77f5..d628e0259f 100644 --- a/UTILS/PutOrders/puo_allorders.js +++ b/UTILS/PutOrders/puo_allorders.js @@ -141,7 +141,10 @@ function send1Order(Bedrijf_key, prs_loc_key, XMLnode, OpdrKey, ordernr, Sender, if (nextdatum > new Date()) { Log2File(1, "Failed {0} time(s) between {1} and {2}, delaying until {3}".format(failcount, toDateTimeString(firstdatum), toDateTimeString(faildatum), toDateTimeString(nextdatum))); - return false; + if (forceOrders) + Log2File(1, "*But* parameter FORCE is given so sending anyway"); + else + return false; } else { diff --git a/UTILS/PutOrders/puo_putorders.wsc b/UTILS/PutOrders/puo_putorders.wsc index 21e48188a4..ea8c68182e 100644 --- a/UTILS/PutOrders/puo_putorders.wsc +++ b/UTILS/PutOrders/puo_putorders.wsc @@ -86,6 +86,7 @@ var Oracle; var customerId; var PUO_LOGPATH; var custabspath; +var forceOrders = 0; // Niet ondersteund in immediate mode, het zal toch bijna altijd de eerste keer falen zijn function initialize(params) { diff --git a/UTILS/PutOrders/puo_putorders.wsf b/UTILS/PutOrders/puo_putorders.wsf index f11bcc8c1c..3cc12380ea 100644 --- a/UTILS/PutOrders/puo_putorders.wsf +++ b/UTILS/PutOrders/puo_putorders.wsf @@ -4,10 +4,9 @@ File: put_orders.wsf Calling: cscript ..\..\..\utils\PutOrders\put_orders.wsf - Parameters: 0: customerId - 1: + Parameters: Optioneel FORCE om te zorgen dat falende orders toch weer gestuurd worden Context: Scheduled task - Note: De code verondersteld (nog) dat de current folder een cust/xxxx/tasks folder is + Note: De code veronderstelt (nog) dat de current folder een cust/xxxx/tasks folder is Concreter: ../Oracle.udl wordt gebruikt */ ]]> @@ -41,6 +40,9 @@ var applicatieRun = new Date(); var Oracle = Connect2Oracle('puo_Putorders.wsf'); + var forceOrders = 0; + if (WScript.Arguments.length > 0 && WScript.Arguments(0) == 'FORCE') + forceOrders = 1; // forceer falende orders die normaal uitgesteld zouden worden. var sql = "SELECT fac_version_cust FROM fac_version"; var oRs = Oracle.Execute(sql); diff --git a/UTILS/PutOrders/putorders.bat b/UTILS/PutOrders/putorders.bat index e7d197c5f7..2b3fa6f3bd 100644 --- a/UTILS/PutOrders/putorders.bat +++ b/UTILS/PutOrders/putorders.bat @@ -3,4 +3,4 @@ @REM CALL ..\..\..\utils\putorders\putorders.bat @ @title %cd% -@cscript //NoLogo ..\..\..\utils\putOrders\puo_putOrders.wsf +@cscript //NoLogo ..\..\..\utils\putOrders\puo_putOrders.wsf %*