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

MARX#88238 Wens om ook status 'onderbroken' naar ALLR Facilitor door te geven

Browse Source 
svn path=/Mareon/trunk/; revision=69854
This commit is contained in:
Marcel Bourseau
2025-07-25 14:54:36 +00:00
parent 3c45681913
commit 89edba8e33
9 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ax/SRC/AxFacilitor.js
View File

@@ -792,7 +792,7 @@ function MARX_LOG_XML_SETTINGS()
// 1.93 -- MARX#85115: Multi-thread check aanscherpen: onterechte uitvalmails Heyday en Vogellanden
// 1.94 -- MARX#86119: Integratie Viadata CI365 en Mareon voor inspectieproces + MARX#87722 Mareon mist statustekst bij opdrachtafmelding naar Facilitor
// 1.95 -- MARX#89177: Notitie komt in geval van onderbreken niet mee naar (ERP)systeem van opdrachtgever
// 1.96 -- MARX#89952: Notities in Mareon ook als notitie in Facilitor (en niet meer in afhandeling)
// 1.96 -- MARX#89952: Notities in Mareon ook als notitie in Facilitor (en niet meer in afhandeling) + MARX#88238 Wens om ook status 'onderbroken' naar ALLR Facilitor door te geven
var G_Mareon_Adapter = "1.96";

13
ax/SRC/FCLT_PlanServiceTask.js
View File

@@ -5,15 +5,20 @@
//
function FCLT_PlanServiceTask(v_company_id, v_taskId, v_externnr, v_extraInfo, v_plandate)
function FCLT_PlanServiceTask(v_company_id, v_taskId, v_externnr, v_extraInfo, v_plandate, v_plandate2)
{
var v_API = "MARX_OPDR_STATUS";
var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
+ " <plandatum>" + v_plandate + "</plandatum>";
var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">";
if (v_plandate != ""){
v_req = v_req + "<plandatum>" + v_plandate + "</plandatum>";
}
if (v_plandate2 != ""){
v_req = v_req + "<plandatum2>" + v_plandate2 + "</plandatum2>";
}
if (v_extraInfo != ""){
v_req = v_req + " <note>" + v_extraInfo + "</note>";
v_req = v_req + "<note>" + v_extraInfo + "</note>";
}
v_req = v_req + "</opdracht>";

12
ax/SRC/FCLT_SetSupplierText.js
View File

@@ -5,13 +5,19 @@
//
function FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, v_extraInfo)
function FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, v_extraInfo, v_note_flag)
{
var v_API = "MARX_OPDR_STATUS";
var v_req = "<opdracht key=\"" + v_externnr + "\" type=\"update\">"
+ " <note>" + v_extraInfo + "</note>"
+ " </opdracht>";
+ " <note>" + v_extraInfo + "</note>";
if (v_note_flag != ""){
// note_flag 4 is default, die hoeven we ook niet expliciet mee te geven, maar als notitie voor FOBO/opdrachgever ism dan is bit +2, oftewel dan zouden we 6 moeten geven.
v_req = v_req + "<noteflag>" + v_note_flag + "</noteflag>";
}
v_req = v_req + "</opdracht>";
var v_type = 1;

4
ax/SRC/F_GetOpdrachtenAcceptedRefused.js
View File

@@ -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_mld_opdr_extrainfo);
v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDCAN", "", "Geweigerd. " + 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);
@@ -162,7 +162,7 @@ function GEN_AnnuleerServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId,
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
}
if (AX_or_Tobias() == "F") {
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
v_resp = FCLT_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "ORDCAN", "", "Geannuleerd. " + v_mld_opdr_extrainfo);
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, v_statuscode, "", v_mld_opdr_extrainfo);

2
ax/SRC/F_GetOpdrachtenGepland.js
View File

@@ -76,7 +76,7 @@ function GEN_PlanServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId, v_ex
v_resp = T_PlanServiceTask (v_company_id, v_taskId, v_date);
}
if (AX_or_Tobias() == "F") {
v_resp = FCLT_PlanServiceTask (v_company_id, v_taskId, v_externnr, v_extraInfo, v_date);
v_resp = FCLT_PlanServiceTask (v_company_id, v_taskId, v_externnr, v_extraInfo, v_date, "");
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "AFH", v_date, v_extraInfo);

5
ax/SRC/F_GetOpdrachtenOnderbroken.js
View File

@@ -76,7 +76,10 @@ function GEN_OnderbreekServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
}
if (AX_or_Tobias() == "F") {
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
if (v_statuscode == "AFR")
v_resp = FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, "Onderbroken (" + v_statuscode + "). " + v_extraInfo, "6");
else
v_resp = FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, "Onderbroken (" + v_statuscode + "). " + v_extraInfo, "");
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, v_statuscode, "", v_extraInfo);

2
ax/SRC/F_GetOpdrachtenOpmerking.js
View File

@@ -73,7 +73,7 @@ function GEN_SetSupplierText(v_company_id, v_taskId, v_externnr, v_extraInfo)
v_resp = T_SetSupplierText(v_company_id, v_taskId, v_extraInfo);
}
if (AX_or_Tobias() == "F") {
v_resp = FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, v_extraInfo);
v_resp = FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, v_extraInfo, "");
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "", "", v_extraInfo);

2
ax/SRC/F_GetOpdrachtenUitvoer.js
View File

@@ -71,7 +71,7 @@ function GEN_UitvoeringServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
}
if (AX_or_Tobias() == "F") {
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
v_resp = FCLT_SetSupplierText(v_company_id, v_taskId, v_externnr, "In uitvoering. " + v_extraInfo, "");
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, v_statuscode, "", v_extraInfo);

2
ax/SRC/F_GetOpdrachtenVerlengd.js
View File

@@ -74,7 +74,7 @@ function GEN_VerlengServiceTask(v_company_id, v_woco_gln, v_lev_gln, v_taskId, v
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
}
if (AX_or_Tobias() == "F") {
v_resp = {api_status_code: 1, api_status_message: "", api_response_message: ""};
v_resp = FCLT_PlanServiceTask (v_company_id, v_taskId, v_externnr, v_extraInfo, "", v_date);
}
if (AX_or_Tobias() == "R") {
v_resp = R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, v_statuscode, v_date, v_extraInfo);