From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001 From: yanweiyuan3 <yanweiyuan3@gmail.com> Date: 星期二, 10 十月 2023 17:45:58 +0800 Subject: [PATCH] Merge branch 'dev' into dev_yy --- _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def index 0fbfea6..ac7e8b0 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def @@ -1,7 +1,7 @@ Quintiq file version 2.0 #parent: liH_Forecast Response OnDoubleClick ( - H_Forecast selection + H_OrderForecastRealQty selection ) id:Response_liH_Forecast_OnDoubleClick { #keys: '[414724.0.111761136]' @@ -14,10 +14,37 @@ SelectItem := select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmOrderForecast" and Obj.ItemKey()="ListSelect"); if( isnull( SelectItem)) { - MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",Value := ""); + MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect", + ValueJsonString := JSON::Object().Add( "SKU",selection.SKU()) + .Add( "SKUName",selection.SKUName()) + .Add( "Util",selection.Unit()) + .Add( "CustomCode",selection.CustomCode()) + .Add( "CustomName",selection.CustomName()) + .Add( "ForecastQty",selection.ForecastQty()) + .Add( "ForecastID",selection.ID()) + .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString()); } - SelectItem.Value(selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName()); - Application.OpenForm( "FrmMaterial","popout"); + else + { + SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU()) + .Add( "SKUName",selection.SKUName()) + .Add( "Util",selection.Unit()) + .Add( "CustomCode",selection.CustomCode()) + .Add( "CustomName",selection.CustomName()) + .Add( "ForecastQty",selection.ForecastQty()) + .Add( "ForecastID",selection.ID()) + .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString()); + } + + jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable ); + if(jResult.Get( "Status").GetBoolean()) + { + Application.OpenForm( "FrmMaterial","popout"); + } + else + { + WebMessageBox::Warning( jResult.Get( "Msg").GetString()); + } *] GroupServerCalls: false } -- Gitblit v1.9.3