@@ -40,14 +40,14 @@
provide notification that a new instance of an object is being created.
If this method returns an error then the object will not be created.]]>
-wsID:%String,Shop:%String="",Requester:%String=""
+wsID:%String,Shop:APPS.TBXWeb.enu.TBXHandel="",Requester:APPS.TBXWeb.enu.TBXHandel=""
1
1
%Status
indien post processing errors --> quiten
- Do ..Logger.Info("POSTPROCESSING_STARTED")
+ Do ..Logger.Info("POSTPROCESSING_STARTED")
Set stPostProcessing = ..PostProcessing()
if 'stPostProcessing Do Quit $$$ERROR($$$GeneralError,"Post processing error")
. Do ..Logger.ErrorMail("POSTPROCESSING_FAILED",$$ParseStatus^vhLib.System(stPostProcessing))
@@ -146,6 +150,13 @@
]]>
+
+1
+Boolean
+
+
+
WSOrd
1
@@ -185,6 +196,7 @@
Else Do
. Set Info = "From="_From_" To="_$$$LCVT(lbTo)
. Do ..Logger.ErrorMail("MAIL_FAILED",Info_" Error="_$$ParseStatus^vhLib.System(stSendMail))
+
Quit stSendMail
]]>
Index: cspBasis/GAProdTBox.cls.xml
===================================================================
diff -u -r22 -r33
--- cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 22)
+++ cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 33)
@@ -1358,6 +1358,25 @@
Actie:%String,Domain:%String,KLNr:%String,WizMode:%String,wsID:%String,Verwerker:%String,Taal:%String,VhisieLogin:%String,lbExtras:%List
1
+
+
+1
+%XML.Adaptor,%RegisteredObject
+0
+
+
+%Integer
+1
+
+
+
+EDINr:%Integer
+1
+1
+%Status
+
+
+
+
Index: APPS/TBXWeb/impl/HFLBOrderHandler.cls.xml
===================================================================
diff -u
--- APPS/TBXWeb/impl/HFLBOrderHandler.cls.xml (revision 0)
+++ APPS/TBXWeb/impl/HFLBOrderHandler.cls.xml (revision 33)
@@ -0,0 +1,108 @@
+
+
+
+1
+AbstractOrderHandler
+0
+
+
+1
+
+
+
+%String
+
+
+
+
+Boolean
+
+
+
+
+%Status
+",$lb("ICT_SupportTBX@vanhoecke.be"),"HFLB POST for WSid : "_..WSOrd.%Id(),Stream,1)
+
+ If $$$ISERR(stPost) Do Quit stPost
+ . Do ..Logger.Error("HFLB_POST_FAILED","wsID = "_..WSOrd.mID_" Error = "_$$ParseStatus^vhLib.System(stPost))
+
+
+ // Resultaat van de HTTP-post controleren
+ Set Result=""
+ If flagTest {
+ Set Result=$$$OK ; Geen verdere afhandeling indien in test mode :D
+ }
+ Else {
+ If HttpRequest.HttpResponse.StatusCode = 200 {
+ Set Result = $$$OK
+ }
+ Else {
+ Set Result = $$$ERROR($$$GeneralError, HttpRequest.HttpResponse.ReasonPhrase)
+ }
+
+ If $$$ISOK(Result) {
+ Do ..Logger.Info("HFLB_POST_SUCCESS","wsID = "_..WSOrd.mID)
+ }
+ Else {
+ Set ErrorInfo = HttpRequest.HttpResponse.ReasonPhrase _ " (StatusCode="_HttpRequest.HttpResponse.StatusCode_")"
+ Do ..Logger.ErrorMail("HFLB_HTTPRESPONSE_INVALID","wsID = "_..WSOrd.mID_" Error = "_ErrorInfo)
+ }
+ }
+
+ Quit Result
+]]>
+
+
+
+%String
+
+
+
+
Index: vhDeploy/WV/Deploy20110905x0939.cls.xml
===================================================================
diff -u
--- vhDeploy/WV/Deploy20110905x0939.cls.xml (revision 0)
+++ vhDeploy/WV/Deploy20110905x0939.cls.xml (revision 33)
@@ -0,0 +1,20 @@
+
+
+
+1
+svn.Deploy
+0
+
+
+1
+
+
+
+
Index: APPS/TBXWeb/enu/TBXHandel.cls.xml
===================================================================
diff -u
--- APPS/TBXWeb/enu/TBXHandel.cls.xml (revision 0)
+++ APPS/TBXWeb/enu/TBXHandel.cls.xml (revision 33)
@@ -0,0 +1,88 @@
+
+
+
+datatype
+1
+TECH.Enumeration
+0
+
+
+,VHEPN,HEIN,LMC,DUPO,HELMY,HFLE,SFS,MBHO,HFLB
+
+
+
+
+Pulderbos (BE)
+1
+%String
+
+
+
+
+
+Duitsland
+1
+%String
+
+
+
+
+
+Vroegere naam was Helmondse Yzerhandel (NL)
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
+
+Optima groep is LMC (FR)
+1
+%String
+
+
+
+
+
+Meubelbeslag Holland (NL)
+1
+%String
+
+
+
+
+
+SFS Unimarket (CH)
+1
+%String
+
+
+
+
+1
+%String
+
+
+
+
Index: WS/TBX/SFS/OrderServiceInternal.cls.xml
===================================================================
diff -u -r17 -r33
--- WS/TBX/SFS/OrderServiceInternal.cls.xml (.../OrderServiceInternal.cls.xml) (revision 17)
+++ WS/TBX/SFS/OrderServiceInternal.cls.xml (.../OrderServiceInternal.cls.xml) (revision 33)
@@ -24,61 +24,60 @@
1
SecureKey:%String,EDInr:%Integer,sfsref:%String,sfsDeliveryDate:%String
-ConfirmOrderResult
+WS.TBX.SFS.ConfirmOrderResult
1
zoniet fout genereren.
- ;If wsOrd.KLNummer '= "55946" Do Do ..ReturnFault(##class(WS.WSServerFault).%New("Test customer not valid", ..#SERVICENAME, "CO"))
- ;. Do oLogger.ErrorMail("CHK_CUST_wsORD","Customer "_wsOrd.KLNummer_" not valid")
+ Do OrderServiceHelper.ControleerSecureKey(SecureKey)
+ Set wsOrder=OrderServiceHelper.OpenWSOrder(EDInr)
+ ; // Controle op Test klant SFS (KLNr=55946) --> zoniet fout genereren.
+ ; If wsOrder.KLNummer '= "55946" {
+ ; Do Logger.ErrorMail("CHK_CUST_wsORD","Customer "_wsOrder.KLNummer_" not valid")
+ ; Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Test customer not valid"))
+ ; }
+
set sfsref = $get(sfsref)
- If $piece(wsOrd.Opmerking1,$$$CRLF) '= sfsref Do
- . Set wsOrd.Opmerking1 = $get(sfsref)_ $$$CRLF _wsOrd.Opmerking1
-
- Set wsOrd.LeverTijd = $g(sfsDeliveryDate)
+ If $piece(wsOrder.Opmerking1,$$$CRLF) '= sfsref {
+ Set wsOrder.Opmerking1 = $get(sfsref)_ $$$CRLF _wsOrder.Opmerking1
+ }
- Do oLogger.Info("SFS_ORDER","EDINr: "_EDInr_" sfsref : "_sfsref _ " Levertijd : "_$g(sfsDeliveryDate))
+ Set wsOrder.LeverTijd = $get(sfsDeliveryDate)
+
+ Do Logger.Info("SFS_ORDER","EDINr: "_EDInr_" sfsref : "_sfsref _ " Levertijd : "_$Get(sfsDeliveryDate))
- Set scSaved = wsOrd.%Save()
- If 'scSaved Do Do ..ReturnFault(##class(WS.WSServerFault).%New("Order not saved", ..#SERVICENAME, "CO"))
- . Do oLogger.Error("SAVE_wsORD","EDInr: "_EDInr_" not saved : "_$$ParseStatus^vhLib.System(scSaved))
+ ;Do OrderServiceHelper.SaveWSOrder(wsOrder) ; Deze Save() is overbodig als de SubmitWSOrder() in ditzelfde caché-process wordt afgehandeld.
+ Do OrderServiceHelper.SubmitWSOrder(wsOrder)
- Set scOrdered = ##class(APPS.TBXWeb.OrderHandling).Order(wsID,"VHEPN","SFS")
- If 'scOrdered Do Do ..ReturnFault(##class(WS.WSServerFault).%New(SFSMessage, ..#SERVICENAME, "CO"))
- . Set SFSMessage = ..GetSFSMessage(scOrdered)
- . Do oLogger.Error("wsORD_ORDER","Order not confirmed : "_$$ParseStatus^vhLib.System(scOrdered))
+ Do Logger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
- Do oLogger.Info("wsORD_ORDER","Order "_EDInr_" ordered")
+ // Return EDI number
+ Set OrderResult=##class(WS.TBX.SFS.ConfirmOrderResult).%New(EDInr,3) ; .%New(EDInr,$$ProductieDagen^FLOWHALUX())
+ Quit OrderResult
- // Return EDI number for testing purposes
- Quit ##class(ConfirmOrderResult).%New(EDInr,3)
- //Quit ##class(ConfirmOrderResult).%New(EDInr,$$ProductieDagen^FLOWHALUX())
+
+ConfirmOrderError
+ Set $ZTrap=""
+ Set Exception=##class(TECH.ExceptionHandler).Catch()
+ Set ErrorMessage=""
+ If (Exception.%Extends("WS.TBX.OrderService.VerwerkingException")) {
+ // Deze specifieke exceptions zijn reeds gelogd. Hier enkel de SoapFault opzetten
+ Set ErrorMessage=Exception.GeefOmschrijving()
+ }
+ Else
+ {
+ // Alle andere exceptions en caché-errors worden hier gelogd+gemaild naar ICT
+ Set ErrorMessage="Error in confirmation of order "_EDInr_". Van Hoecke ICT has been notified."
+ Do Logger.ErrorMail("HAEFELE_ORDER",ErrorMessage_$$$CRLF_Exception.GeefOmschrijving()_" "_Exception.ToString())
+ }
+ Do ..ReturnFault(##class(WS.WSServerFault).%New(ErrorMessage, ..#SERVICENAME, "CO"))
]]>
-
-
-1
-Status:%Status
-%String
-
-
Index: WS/TBX/OrderService/Verwerker.cls.xml
===================================================================
diff -u
--- WS/TBX/OrderService/Verwerker.cls.xml (revision 0)
+++ WS/TBX/OrderService/Verwerker.cls.xml (revision 33)
@@ -0,0 +1,101 @@
+
+
+
+APPS.TBXWeb
+1
+%RegisteredObject
+0
+
+
+APPS.TBXWeb.enu.TBXHandel
+
+
+
+WS.TBX.OrderService.Logger
+
+
+
+OHRequester:APPS.TBXWeb.enu.TBXHandel,Logger:vhLib.Logger
+1
+1
+%Status
+
+
+
+
+SecureKey:%String
+
+
+
+
+EDInr:%Integer
+WS.TBX.Order
+
+
+
+
+wsOrder:WS.TBX.Order
+
+
+
+
+wsOrder:WS.TBX.Order
+
+
+
+
+1
+Status:%Status
+%String
+
+
+
+
Index: APPS/TBXWeb/EMailAdressen.inc.rou
===================================================================
diff -u -r25 -r33
--- APPS/TBXWeb/EMailAdressen.inc.rou (.../EMailAdressen.inc.rou) (revision 25)
+++ APPS/TBXWeb/EMailAdressen.inc.rou (.../EMailAdressen.inc.rou) (revision 33)
@@ -53,6 +53,14 @@
#define EMailOVMbhoTEST """MBHO OV."" "
#define EMailAKMbho """MBHO TBX Inkoop"" "
+ ; #define EMailAnon2Hflb "AdminTBX@vanhoecke.be"
+ #define EMailOVHflb2VH "OV_TBX_HFLB@vanhoecke.be"
+ ; #define EMailOVHflb2VHTEST """OV_TBX_HFLB"" "
+ #define EMailOVHflb2VHTEST """OV_TBX_HFLB"" "
+ ; #define EMailOVHflb """MBHO OV."" "
+ ; #define EMailOVHflbTEST """MBHO OV."" "
+ #define EMailAKHflb """Hafele.be TBX Inkoop"" "
+
; === E-mail adressen voor andere info ===
#define EMailTBXInfo2Hein "info@tandem-box.de"
#define EMailTBXInfo2SfsFR "ferrements@sfsunimarket.biz"
Index: WS/TBX/SFS/ConfirmOrderResult.cls.xml
===================================================================
diff -u -r2 -r33
--- WS/TBX/SFS/ConfirmOrderResult.cls.xml (.../ConfirmOrderResult.cls.xml) (revision 2)
+++ WS/TBX/SFS/ConfirmOrderResult.cls.xml (.../ConfirmOrderResult.cls.xml) (revision 33)
@@ -16,12 +16,12 @@