diff --git a/LSL2/OIWIN/WEB_OI_WIZARD.json b/LSL2/OIWIN/WEB_OI_WIZARD.json index 619523c..dc49213 100644 --- a/LSL2/OIWIN/WEB_OI_WIZARD.json +++ b/LSL2/OIWIN/WEB_OI_WIZARD.json @@ -17,15 +17,15 @@ "<1,4>": "", "<1,5>": "0", "<1,6>": "0", - "<1,7>": "-2083", - "<1,8>": "-1097", + "<1,7>": "-1184", + "<1,8>": "-761", "<1,9>": "OI Wizard", "<1,10>": { "<1,10,1>": "0x84CF0000", "<1,10,2>": "0x100" }, "<1,11>": { - "<1,11,1>": "0x8000", + "<1,11,1>": "0xC000", "<1,11,2>": "0x80000000" }, "<1,12>": "", @@ -165,7 +165,7 @@ "<1,62,1>": "0", "<1,62,2>": "", "<1,62,3>": "", - "<1,62,4>": "0", + "<1,62,4>": "1", "<1,62,5>": "0", "<1,62,6>": "0", "<1,62,7>": "", @@ -227,10 +227,10 @@ "<1,2>": "", "<1,3>": "WEBVIEW", "<1,4>": "WEB_OI_WIZARD", - "<1,5>": "12", - "<1,6>": "12", - "<1,7>": "2060", - "<1,8>": "1076", + "<1,5>": "9", + "<1,6>": "8", + "<1,7>": "1167", + "<1,8>": "745", "<1,9>": "", "<1,10>": { "<1,10,1>": "0x56000000", diff --git a/LSL2/STPROC/WEB_OI_WIZARD_EVENTS.txt b/LSL2/STPROC/WEB_OI_WIZARD_EVENTS.txt index a58b335..d86576d 100644 --- a/LSL2/STPROC/WEB_OI_WIZARD_EVENTS.txt +++ b/LSL2/STPROC/WEB_OI_WIZARD_EVENTS.txt @@ -25,18 +25,29 @@ Event WINDOW.CREATE(CreateParam) OIWizardBaseUrl = Environment_Services('GetOIWizardBaseUrl') Set_Property(@Window, '@BASE_URL', OIWizardBaseUrl) - InitNavPage = CreateParam + InitNavPage = CreateParam Set_Property(@Window, '@INIT_NAV_PAGE', InitNavPage) Set_Property(@Window, '@FIRST_RENDER', True$) Set_Property(@Window:'.WEBVIEW_MAIN', 'AUTOSIZEHEIGHT', True$) Set_Property(@Window:'.WEBVIEW_MAIN', 'AUTOSIZEWIDTH', True$) - PlaceDialog(-2, -2) + ScreenSize = Get_Property('SYSTEM', 'SIZE') + ClientWidth = ScreenSize<3> + ClientHeight = ScreenSize<4> + FormSize = Get_Property(@Window, 'SIZE') + FormWidth = Int(ClientWidth * (3/4)) + FormHeight = Int(ClientHeight * (3/4)) + FormSize<1> = Int( (ClientWidth - FormWidth ) / 2 ) + FormSize<2> = Int( (ClientHeight - FormHeight ) / 2 ) + FormSize<3> = FormWidth + FormSize<4> = FormHeight + FormSize<5> = True$ + Set_Property(@Window, 'SIZE', FormSize) End Event Event WEBVIEW_MAIN.WEBVIEWCREATED() - + OIWizardURL = Get_Property(@Window, '@BASE_URL') NavPage = Get_Property(@Window, '@INIT_NAV_PAGE') NavTo = OIWizardURL:NavPage @@ -49,7 +60,7 @@ end event Event WEBVIEW_MAIN.WEBNAVIGATED(NavID, URI, Redirected, UserInitiated, StatusInfo, FrameID) - + FirstRender = Get_Property(@Window, '@FIRST_RENDER') If FirstRender then SuccessFlag = Exec_Method(CtrlEntID, "DELETECOOKIES", '*') @@ -103,4 +114,3 @@ Event WINDOW.TIMER() end event - diff --git a/LSL2/STPROC/WORK_ORDER_SERVICES.txt b/LSL2/STPROC/WORK_ORDER_SERVICES.txt index 48b1324..141c37f 100644 --- a/LSL2/STPROC/WORK_ORDER_SERVICES.txt +++ b/LSL2/STPROC/WORK_ORDER_SERVICES.txt @@ -2343,7 +2343,39 @@ Service UpdateOpenWorkOrderData() LogData<4> = ErrorMsg Logging_Services('AppendLog', objVerifyWOMatKeysLog, LogData, @RM, @FM) MonaStatus = 'critical' - end + end + Work_Order_Services('UpdateReceivedQty', NextOpenWoLogKey) + If Error_Services('HasError') then + LogData<1> = OConv(Datetime(), 'DT/^S') + ErrorMsg = 'Error calling UpdateReceivedQty for WO_LOG ':NextOpenWoLogKey:'. ':Error_Services('GetMessage') + LogData<4> = ErrorMsg + Logging_Services('AppendLog', objVerifyWOMatKeysLog, LogData, @RM, @FM) + MonaStatus = 'critical' + end + Work_Order_Services('UpdateReleasedQty', NextOpenWoLogKey) + If Error_Services('HasError') then + LogData<1> = OConv(Datetime(), 'DT/^S') + ErrorMsg = 'Error calling UpdateReleasedQty for WO_LOG ':NextOpenWoLogKey:'. ':Error_Services('GetMessage') + LogData<4> = ErrorMsg + Logging_Services('AppendLog', objVerifyWOMatKeysLog, LogData, @RM, @FM) + MonaStatus = 'critical' + end + Work_Order_Services('UpdateScrappedQty', NextOpenWoLogKey) + If Error_Services('HasError') then + LogData<1> = OConv(Datetime(), 'DT/^S') + ErrorMsg = 'Error calling UpdateScrappedQty for WO_LOG ':NextOpenWoLogKey:'. ':Error_Services('GetMessage') + LogData<4> = ErrorMsg + Logging_Services('AppendLog', objVerifyWOMatKeysLog, LogData, @RM, @FM) + MonaStatus = 'critical' + end + Work_Order_Services('UpdateShippedQty', NextOpenWoLogKey) + If Error_Services('HasError') then + LogData<1> = OConv(Datetime(), 'DT/^S') + ErrorMsg = 'Error calling UpdateShippedQty for WO_LOG ':NextOpenWoLogKey:'. ':Error_Services('GetMessage') + LogData<4> = ErrorMsg + Logging_Services('AppendLog', objVerifyWOMatKeysLog, LogData, @RM, @FM) + MonaStatus = 'critical' + end end end else LogData<1> = OConv(Datetime(), 'DT/^S')