From 1b0f461e0db93c3f504b8be975a5b7ffddbcc584 Mon Sep 17 00:00:00 2001
From: Tianma21 <Administrator@TOTDQAE01.tianmame.cn>
Date: 星期日, 08 十月 2023 13:47:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev
---
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def | 4 +++-
1 files changed, 3 insertions(+), 1 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 bda5c5d..67308a0 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"
@@ -18,6 +18,7 @@
{
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())
@@ -28,6 +29,7 @@
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())
@@ -36,7 +38,7 @@
.Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
}
- jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month());
+ jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable);
if(jResult.Get( "Status").GetBoolean())
{
Application.OpenForm( "FrmMaterial","popout");
--
Gitblit v1.9.3