From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001 From: Administrator <renhui.hao@capgemini.com> Date: 星期一, 25 九月 2023 22:43:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick#880.def | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick\043880.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick\043880.def" index bf1f99c..8eb0570 100644 --- "a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick\043880.def" +++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick\043880.def" @@ -1,7 +1,7 @@ Quintiq file version 2.0 #parent: Panel351/btn_Add_Order_FOF449 Response OnClick ( - H_Forecast selection + H_OrderForecastRealQty selection ) id:Response_Panel351_btn_Add_Order_FOF449_OnClick_880 { #keys: '[414724.0.141244111]' @@ -17,19 +17,17 @@ if( isnull( SelectItem)) { MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect", - Value := selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName(), - ValueJsonString := JSON::Object().Add( "SKU",selection.SKU()) - .Add( "Util",selection.Util()) - .Add( "CustomCode",selection.CustomCode()) - .Add( "CustomName",selection.CustomName()).Build().AsString()); + ValueJsonString := JSON::Object().Add( "SKU",selection.SKU()) + .Add( "Util",selection.Unit()) + .Add( "CustomCode",selection.CustomCode()) + .Add( "CustomName",selection.CustomName()).Build().AsString()); } else { - SelectItem.Value(selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName()); SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU()) - .Add( "Util",selection.Util()) - .Add( "CustomCode",selection.CustomCode()) - .Add( "CustomName",selection.CustomName()).Build().AsString()); + .Add( "Util",selection.Unit()) + .Add( "CustomCode",selection.CustomCode()) + .Add( "CustomName",selection.CustomName()).Build().AsString()); } Application.OpenForm( "FrmAuthorizeAndCountersign_Order","modal"); } -- Gitblit v1.9.3