From 806842fa5447acbf702506a8904f9ec89fafd51a Mon Sep 17 00:00:00 2001 From: "Stieber Daniel (CSC FI SPS MESLEO)" Date: Tue, 18 Feb 2025 22:26:23 +0100 Subject: [PATCH] Merged PR 11157: Removed setting the order type in GetOrderStatusUpdate service. Added more lo... Removed setting the order type in GetOrderStatusUpdate service. Added more logging to CreateNewOrder service. --- LSL2/STPROC/NICA_ORDERS_SERVICES.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt index 5fc885e..504288a 100644 --- a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt +++ b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt @@ -250,6 +250,15 @@ Service CreateNewOrder(EntityType=ENTITY_TYPES, EntityID, OrderType=ORDER_TYPES) end else NicaOrderRec = 100 end + + LogNicaOrderRec = NicaOrderRec + Swap @FM with ',' in LogNicaOrderRec + LogData = '' + LogData<1> = Oconv(Date(), 'D4/') : ' ' : Oconv(Time(), 'MTS') ; // Logging DTM + LogData<2> = Machine + LogData<3> = 'Nica order record to write: ':LogNicaOrderRec + Logging_Services('AppendLog', objLog, LogData, @RM, @FM, False$) + Database_Services('WriteDataRow', 'NICA_ORDERS', OrderId, NicaOrderRec, True$, False$, False$) If Error_Services('NoError') then If ( (OrderType _EQC 'INITIATE_IDLE') and (EntityType _EQC 'REACTOR') ) then @@ -553,7 +562,6 @@ Service GetOrderStatusUpdate(OrderId) ObjResponseJson = '' If SRP_JSON(ObjResponseJson, 'Parse', HttpResponseJson) EQ '' then IsComplete = SRP_JSON(ObjResponseJson, 'GetValue', 'isComplete') - NicaOrderRec = SRP_JSON(ObjResponseJson, 'GetValue', 'type') NicaOrderRec = SRP_JSON(ObjResponseJson, 'GetValue', 'state') NicaOrderRec = IsComplete If IsComplete EQ False$ then