From 5fb3cbfbef5b1a33ba451ae5f8e0e4e5080bb42d Mon Sep 17 00:00:00 2001 From: Marcel Bourseau Date: Tue, 5 Mar 2019 11:10:50 +0000 Subject: [PATCH] MARX#56792: Mareon sync adapter aanpassen tbv nieuwe statussen naar Tobias2012 svn path=/Mareon/trunk/; revision=41303 --- ax/AxFacilitor.NMK | 2 + ax/AxFacilitor.SRC | 2 + ax/SRC/A2012_VerlengServiceTask.js | 33 ++++++++++++++ ax/SRC/AxFacilitor.js | 8 ++++ ax/SRC/F_GetOpdrachtenVerlengd.js | 72 ++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+) create mode 100644 ax/SRC/A2012_VerlengServiceTask.js create mode 100644 ax/SRC/F_GetOpdrachtenVerlengd.js diff --git a/ax/AxFacilitor.NMK b/ax/AxFacilitor.NMK index c797f4b..1b5eb16 100644 --- a/ax/AxFacilitor.NMK +++ b/ax/AxFacilitor.NMK @@ -126,6 +126,8 @@ $(OBJ)\objMareon.js: \ $(MSRC)\A2012_PlanServiceTask.js \ $(MSRC)\FCLT_PlanServiceTask.js \ $(MSRC)\T_PlanServiceTask.js \ + $(MSRC)\F_GetOpdrachtenVerlengd.js \ + $(MSRC)\A2012_VerlengServiceTask.js \ $(MSRC)\F_GetOpdrachtenAcceptedRefused.js \ $(MSRC)\A_RefuseServiceTask.js \ $(MSRC)\A2012_RefuseServiceTask.js \ diff --git a/ax/AxFacilitor.SRC b/ax/AxFacilitor.SRC index cb7a7ae..585c49d 100644 --- a/ax/AxFacilitor.SRC +++ b/ax/AxFacilitor.SRC @@ -30,6 +30,8 @@ #include "SRC\A2012_PlanServiceTask.js" #include "SRC\FCLT_PlanServiceTask.js" #include "SRC\T_PlanServiceTask.js" +#include "SRC\F_GetOpdrachtenVerlengd.js" +#include "SRC\A2012_VerlengServiceTask.js" #include "SRC\F_GetOpdrachtenAcceptedRefused.js" #include "SRC\A_RefuseServiceTask.js" #include "SRC\A2012_RefuseServiceTask.js" diff --git a/ax/SRC/A2012_VerlengServiceTask.js b/ax/SRC/A2012_VerlengServiceTask.js new file mode 100644 index 0000000..57661f0 --- /dev/null +++ b/ax/SRC/A2012_VerlengServiceTask.js @@ -0,0 +1,33 @@ +// -------------------------------------------------------------------------------------- +// A2012_VerlengServiceTask.js +// Copyright 2019 Facilitor. 053-4800 700, helpdesk@facilitor.nl +// Written by MB (2019) +// + + +function A2012_VerlengServiceTask(v_company_id, v_taskId, v_plandate2) +{ + +var v_API = "updatePurchStatus"; +if (v_plandate2 != "") + {v_plandate2 = v_plandate2 + "Z";} +else + {v_plandate2 = "1900-01-01T00:00:00Z";} + +v_req = '<_companyID>' + v_company_id + " <_taskId>" + v_taskId + " <_planDate>" + v_plandate2 + ""; +v_type = 0; +var v_soapAction = "SupplierPortal/updatePurchStatus"; +v_resp = apiAX(v_API, v_req, v_type,v_soapAction); + +if (v_type == 1 && v_resp != "") + { + oStream = new ActiveXObject("ADODB.Stream"); + oStream.Open(); + oStream.Type = 1; // adTypeBinary + oStream.Write(v_resp); // responseText geeft encoding problemen! + oStream.SaveToFile ("Log/test" + v_supplier_id + ".xml", 2); + oStream.Close(); + + } +return v_resp; +} \ No newline at end of file diff --git a/ax/SRC/AxFacilitor.js b/ax/SRC/AxFacilitor.js index 5570a42..d236826 100644 --- a/ax/SRC/AxFacilitor.js +++ b/ax/SRC/AxFacilitor.js @@ -61,6 +61,10 @@ function FCLT_2_AX2012_GeplandeOpdrachten(){ F_GetOpdrachten_Gepland(); } +function FCLT_2_AX2012_VerlengdeOpdrachten(){ + F_GetOpdrachten_Verlengd(); +} + function FCLT_2_AX2012_AcceptRefuseOpdracht(){ F_GetOpdrachten_AcceptRefuse(); } @@ -194,6 +198,10 @@ function Ax2012_2_FACILITOR() FCLT_2_AX2012_GeplandeOpdrachten(); __Log("*** END"); + __Log("*** START FCLT --> AX2012 : Verlengde opdrachten uit Facilitor naar AX ***"); + FCLT_2_AX2012_VerlengdeOpdrachten(); + __Log("*** END"); + __Log("*** START FCLT --> AX2012 : Afgemelde opdrachten uit Facilitor naar AX ***"); FCLT_2_AX2012_AfgemeldeOpdrachten(); __Log("*** END"); diff --git a/ax/SRC/F_GetOpdrachtenVerlengd.js b/ax/SRC/F_GetOpdrachtenVerlengd.js new file mode 100644 index 0000000..74176d1 --- /dev/null +++ b/ax/SRC/F_GetOpdrachtenVerlengd.js @@ -0,0 +1,72 @@ +// -------------------------------------------------------------------------------------- +// F_GetOpdrachten_Verlengd.js +// Copyright 2014 SG|facilitor. 053-4800 700, helpdesk@sgfacilitor.nl +// Written by MB (2014) +// +// MAREON Connector/Adapter Ax -> FACILITOR en Facilitor -> Ax +// -------------------------------------------------------------------------------------- + + +function F_GetOpdrachten_Verlengd() +{ + + var v_API = "EINDEGEPLANDE_OPDR_4AX"; + var v_APIKEY = G_marx_apikey; + var v_req = "" + G_Mareon_Adapter + "" + v_APIKEY + "" + var v_type = 1; // xml + var v_soap_envelop = 1; //soap-envelop eromheen + + var v_resp = apiFCLT(G_marx_url, v_API, v_APIKEY, v_req, v_type, v_soap_envelop); + + var l_node; + + __Log("F_GetOpdrachten_Verlengd: " + v_resp.text,1); + + // Uitlezen van XML's... + var i = 1; + var strQuery = "//xml/mld_ordr[" + i + "]"; + var l_deelxml = v_resp.selectSingleNode(strQuery); + while (l_deelxml) + { + l_node = strQuery + "/ax_company_id"; + var v_company_id = v_resp.selectSingleNode(l_node).text; + + l_node = strQuery + "/mld_opdr_ordernr"; + var v_taskId = v_resp.selectSingleNode(l_node).text; + + l_node = strQuery + "/mld_opdr_externnr"; + var v_externnr = v_resp.selectSingleNode(l_node).text; + + var l_node = strQuery + "/mld_opdr_opmerking"; + var v_extraInfo = v_resp.selectSingleNode(l_node).text; + + var l_node = strQuery + "/mld_opdr_plandatum2"; + var v_date = v_resp.selectSingleNode(l_node).text; + + __Log("v_company_id: " + v_company_id,1); + __Log("v_taskId: " + v_taskId,1); + __Log("v_externnr: " + v_externnr,1); + __Log("v_extraInfo: " + v_extraInfo,1); + __Log("v_date: " + v_date,1); + + //if (AX_or_Tobias() == "A") { + // A_VerlengServiceTask (v_company_id, v_taskId, v_date); + //} + if (AX_or_Tobias() == "A12") { + A2012_VerlengServiceTask (v_company_id, v_taskId, v_date); + } + //if (AX_or_Tobias() == "T") { + // T_PlanServiceTask (v_company_id, v_taskId, v_date); + //} + //if (AX_or_Tobias() == "F") { + // FCLT_VerlengServiceTask (v_company_id, v_taskId, v_externnr, v_date); + //} + //if (AX_or_Tobias() == "R") { + // R_SetOpdrachtStatus (v_company_id, v_taskId, v_externnr, "verlengen", v_date, v_extraInfo); + //} + + i = i + 1; + var strQuery = "//xml/mld_ordr[" + i + "]"; + l_deelxml = v_resp.selectSingleNode(strQuery); + } +}