From 472c228ef6d7c8d877558ff90051b1fdb35ffb5c Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期二, 10 十月 2023 14:05:34 +0800
Subject: [PATCH] Merge branch 'dev'

---
 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick#880.def |   21 +++++++++++----------
 1 files changed, 11 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..7432121 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]'
@@ -16,20 +16,21 @@
         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 := 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( "SKUName",selection.SKUName())
+                                                                       .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( "SKUName",selection.SKUName())
+                                                   .Add( "CustomName",selection.CustomName()).Build().AsString());
         }
         Application.OpenForm( "FrmAuthorizeAndCountersign_Order","modal");  
       }

--
Gitblit v1.9.3