From 030dc8a61839890da90149c05fe76664e16a8fb6 Mon Sep 17 00:00:00 2001
From: yunchai <yunying.chai@capgemini.com>
Date: 星期一, 25 九月 2023 18:02:37 +0800
Subject: [PATCH] 20230925合并代码前备份

---
 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick\043222.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick\043222.def"
index 0f50e1f..bda5c5d 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick\043222.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick\043222.def"
@@ -1,7 +1,7 @@
 Quintiq file version 2.0
 #parent: Panel351/btn_Add_Material_FOF503
 Response OnClick (
-  H_Forecast selection
+  H_OrderForecastRealQty selection
 ) id:Response_Panel351_btn_Add_Material_FOF503_OnClick_222
 {
   #keys: '[414724.0.145178766]'
@@ -17,28 +17,26 @@
         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())
-                                                                         .Add( "ForecastQty",selection.ForecastQty())
-                                                                         .Add( "NeedTime",selection.NeedTime().AsQUILL())
-                                                                         .Add( "OrderCode",selection.OrderCode()).Build().AsString());
+                                                                       .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());
         }
         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())
-                                   .Add( "ForecastQty",selection.ForecastQty())
-                                   .Add( "NeedTime",selection.NeedTime().AsQUILL())
-                                   .Add( "OrderCode",selection.OrderCode()).Build().AsString());
+                                                   .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.OrderCode(),"-",selection.NeedTime());
+        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month());
         if(jResult.Get( "Status").GetBoolean())
         {
             Application.OpenForm( "FrmMaterial","popout");

--
Gitblit v1.9.3