From 2709b3e28de35a866a65fa72f589d38a43d5045b Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期日, 24 九月 2023 18:47:20 +0800
Subject: [PATCH] Merge branch 'dev_cyy' into dev
---
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 7f7d6a1..0f50e1f 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"
@@ -21,7 +21,10 @@
ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
.Add( "Util",selection.Util())
.Add( "CustomCode",selection.CustomCode())
- .Add( "CustomName",selection.CustomName()).Build().AsString());
+ .Add( "CustomName",selection.CustomName())
+ .Add( "ForecastQty",selection.ForecastQty())
+ .Add( "NeedTime",selection.NeedTime().AsQUILL())
+ .Add( "OrderCode",selection.OrderCode()).Build().AsString());
}
else
{
@@ -29,9 +32,21 @@
SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
.Add( "Util",selection.Util())
.Add( "CustomCode",selection.CustomCode())
- .Add( "CustomName",selection.CustomName()).Build().AsString());
+ .Add( "CustomName",selection.CustomName())
+ .Add( "ForecastQty",selection.ForecastQty())
+ .Add( "NeedTime",selection.NeedTime().AsQUILL())
+ .Add( "OrderCode",selection.OrderCode()).Build().AsString());
}
- Application.OpenForm( "FrmMaterial","popout");
+
+ jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.OrderCode(),"-",selection.NeedTime());
+ if(jResult.Get( "Status").GetBoolean())
+ {
+ Application.OpenForm( "FrmMaterial","popout");
+ }
+ else
+ {
+ WebMessageBox::Warning( jResult.Get( "Msg").GetString());
+ }
}
else
{
--
Gitblit v1.9.3