From b725007fefde09130bf15aa7567dcfeefb01385d Mon Sep 17 00:00:00 2001
From: Marcel Bourseau <marcel.bourseau@aareon.nl>
Date: Thu, 20 Feb 2025 14:38:31 +0000
Subject: [PATCH] MARX#87722 Mareon mist statustekst bij opdrachtafmelding naar
 Facilitor

svn path=/Mareon/trunk/; revision=68114
---
 ax/SRC/AxFacilitor.js                    | 2 +-
 ax/SRC/FCLT_CompleteServiceTask.js       | 3 ++-
 ax/SRC/FCLT_SetOpdrachtStatus.js         | 5 ++++-
 ax/SRC/F_GetOpdrachtenAcceptedRefused.js | 4 ++--
 ax/SRC/F_GetOpdrachtenAfgemeld.js        | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ax/SRC/AxFacilitor.js b/ax/SRC/AxFacilitor.js
index 2ad923d..48420cc 100644
--- a/ax/SRC/AxFacilitor.js
+++ b/ax/SRC/AxFacilitor.js
@@ -790,7 +790,7 @@ function MARX_LOG_XML_SETTINGS()
 // 1.91 -- MARX#84766: Viewpoint gevoelig voor HTTP-header "Content-Type"
 // 1.92 -- MARX#84162: Mareon SYNC sequentieel per klant
 // 1.93 -- MARX#85115: Multi-thread check aanscherpen: onterechte uitvalmails Heyday en Vogellanden
-// 1.94 -- MARX#86119 Integratie Viadata CI365 en Mareon voor inspectieproces
+// 1.94 -- MARX#86119 Integratie Viadata CI365 en Mareon voor inspectieproces + MARX#87722 Mareon mist statustekst bij opdrachtafmelding naar Facilitor
 
 var G_Mareon_Adapter = "1.94";
 //MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753
diff --git a/ax/SRC/FCLT_CompleteServiceTask.js b/ax/SRC/FCLT_CompleteServiceTask.js
index 2de5a2c..0fc0002 100644
--- a/ax/SRC/FCLT_CompleteServiceTask.js
+++ b/ax/SRC/FCLT_CompleteServiceTask.js
@@ -5,12 +5,13 @@
 //
 
 
-function FCLT_CompleteServiceTask (v_company_id, v_taskId, v_externnr, v_dateComplete)
+function FCLT_CompleteServiceTask (v_company_id, v_taskId, v_externnr, v_dateComplete, v_extraInfo)
 {
 
 var v_API = "MARX_OPDR_STATUS";
 var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
 + "             <status>ORDAFM</status>"
++ "             <opmerking>" + v_extraInfo + "</opmerking>"
 + "             <mut_datum>" + v_dateComplete + "</mut_datum>"
 + "        </opdracht>";
 
diff --git a/ax/SRC/FCLT_SetOpdrachtStatus.js b/ax/SRC/FCLT_SetOpdrachtStatus.js
index 333e6e7..4044e3a 100644
--- a/ax/SRC/FCLT_SetOpdrachtStatus.js
+++ b/ax/SRC/FCLT_SetOpdrachtStatus.js
@@ -5,11 +5,14 @@
 //
 
 
-function FCLT_SetOpdrachtStatus(v_company_id, v_taskId, v_externnr, v_status, v_mut_datum)
+function FCLT_SetOpdrachtStatus(v_company_id, v_taskId, v_externnr, v_status, v_mut_datum, v_extraInfo)
 {
 var v_API = "MARX_OPDR_STATUS";
 var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
           + "   <status>" + v_status + "</status>";
+if (v_extraInfo != ""){
+  v_req = v_req + "   <opmerking>" + v_extraInfo + "</opmerking>";
+}
 if (v_mut_datum != ""){
   v_req = v_req + "<mut_datum>" + v_mut_datum + "</mut_datum>";
 }
diff --git a/ax/SRC/F_GetOpdrachtenAcceptedRefused.js b/ax/SRC/F_GetOpdrachtenAcceptedRefused.js
index 748aa97..ee874d1 100644
--- a/ax/SRC/F_GetOpdrachtenAcceptedRefused.js
+++ b/ax/SRC/F_GetOpdrachtenAcceptedRefused.js
@@ -99,7 +99,7 @@ function GEN_AcceptServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId, v_
     v_resp = T_AcceptServiceTask (v_company_id, v_taskId, "Ja");
   }
   if (AX_or_Tobias() == "F") {
-    v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDACP", "");
+    v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDACP", "", v_mld_opdr_extrainfo);
   }
   if (AX_or_Tobias() == "R") {
     v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ACC", "", v_mld_opdr_extrainfo);
@@ -130,7 +130,7 @@ function GEN_RefuseServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId, v_
     v_resp = T_AcceptServiceTask (v_company_id, v_taskId, "Nee");
   }
   if (AX_or_Tobias() == "F") {
-    v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDCAN", "");
+    v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDCAN", "", v_mld_opdr_extrainfo);
   }
   if (AX_or_Tobias() == "R") {
     v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "WEI", "", v_mld_opdr_extrainfo);
diff --git a/ax/SRC/F_GetOpdrachtenAfgemeld.js b/ax/SRC/F_GetOpdrachtenAfgemeld.js
index 355b56a..80d1c00 100644
--- a/ax/SRC/F_GetOpdrachtenAfgemeld.js
+++ b/ax/SRC/F_GetOpdrachtenAfgemeld.js
@@ -76,7 +76,7 @@ function GEN_CompleteServiceTask(v_mld_opdr_key, v_company_id, v_woco_gln, v_lev
     v_resp = T_CompleteServiceTask (v_company_id, v_taskId, v_dateComplete);
   }
   if (AX_or_Tobias() == "F") {
-    v_resp = FCLT_CompleteServiceTask (v_company_id, v_taskId, v_externnr, v_dateComplete);
+    v_resp = FCLT_CompleteServiceTask (v_company_id, v_taskId, v_externnr, v_dateComplete, v_extraInfo);
   }
   if (AX_or_Tobias() == "R") {
     v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "GER", v_dateComplete, v_extraInfo);