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

MARX#87722 Mareon mist statustekst bij opdrachtafmelding naar Facilitor

Browse Source 
svn path=/Mareon/trunk/; revision=68114
This commit is contained in:
Marcel Bourseau
2025-02-20 14:38:31 +00:00
parent ab7496b954
commit b725007fef
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ax/SRC/AxFacilitor.js
View File

@@ -790,7 +790,7 @@ function MARX_LOG_XML_SETTINGS()
// 1.91 -- MARX#84766: Viewpoint gevoelig voor HTTP-header "Content-Type" // 1.91 -- MARX#84766: Viewpoint gevoelig voor HTTP-header "Content-Type"
// 1.92 -- MARX#84162: Mareon SYNC sequentieel per klant // 1.92 -- MARX#84162: Mareon SYNC sequentieel per klant
// 1.93 -- MARX#85115: Multi-thread check aanscherpen: onterechte uitvalmails Heyday en Vogellanden // 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"; var G_Mareon_Adapter = "1.94";
//MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753 //MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753

3
ax/SRC/FCLT_CompleteServiceTask.js
View File

@@ -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_API = "MARX_OPDR_STATUS";
var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">" var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
+ " <status>ORDAFM</status>" + " <status>ORDAFM</status>"
+ " <opmerking>" + v_extraInfo + "</opmerking>"
+ " <mut_datum>" + v_dateComplete + "</mut_datum>" + " <mut_datum>" + v_dateComplete + "</mut_datum>"
+ " </opdracht>"; + " </opdracht>";

5
ax/SRC/FCLT_SetOpdrachtStatus.js
View File

@@ -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_API = "MARX_OPDR_STATUS";
var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">" var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
+ " <status>" + v_status + "</status>"; + " <status>" + v_status + "</status>";
if (v_extraInfo != ""){
v_req = v_req + " <opmerking>" + v_extraInfo + "</opmerking>";
}
if (v_mut_datum != ""){ if (v_mut_datum != ""){
v_req = v_req + "<mut_datum>" + v_mut_datum + "</mut_datum>"; v_req = v_req + "<mut_datum>" + v_mut_datum + "</mut_datum>";
} }

4
ax/SRC/F_GetOpdrachtenAcceptedRefused.js
View File

@@ -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"); v_resp = T_AcceptServiceTask (v_company_id, v_taskId, "Ja");
} }
if (AX_or_Tobias() == "F") { 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") { if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ACC", "", v_mld_opdr_extrainfo); 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"); v_resp = T_AcceptServiceTask (v_company_id, v_taskId, "Nee");
} }
if (AX_or_Tobias() == "F") { 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") { if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "WEI", "", v_mld_opdr_extrainfo); v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "WEI", "", v_mld_opdr_extrainfo);

2
ax/SRC/F_GetOpdrachtenAfgemeld.js
View File

@@ -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); v_resp = T_CompleteServiceTask (v_company_id, v_taskId, v_dateComplete);
} }
if (AX_or_Tobias() == "F") { 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") { if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "GER", v_dateComplete, v_extraInfo); v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "GER", v_dateComplete, v_extraInfo);