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_FrmMaterial/Response_List832_OnDoubleClick.def | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def
index 8519bc2..b2a673b 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def
@@ -16,6 +16,7 @@
// 棰勬祴璁㈠崟鍩烘湰淇℃伅
CustomCode:="";
CustomName:="";
+ SKUName:="";
SValueJsonString:="";
// 鑾峰彇瀹㈡埛鍚嶇О鍜屽鎴稩D
if(txtSaveForecastData_FM.Text().Length()>0)
@@ -23,6 +24,7 @@
jForecast := JSON::Parse( txtSaveForecastData_FM.Text());
CustomCode := jForecast.Get( "CustomCode").GetString();
CustomName := jForecast.Get( "CustomName").GetString();
+ SKUName := jForecast.Get( "SKUName").GetString();
}
if(selection.MaterialType()="鍗婃垚鍝�")
@@ -33,7 +35,7 @@
JForecast := JSON::Parse(txtSaveForecastData_FM.Text());
ForecastID := JForecast.Get( "ForecastID").GetString();
}
- jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.NeedQty(), ForecastID,"-",selection.NeedDate());
+ jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.NeedQty(), ForecastID,"-",selection.NeedDate(),GlobalOTDTable);
if(jResult.Get( "Status").GetBoolean())
{
de_dh_FM_ProductMP.FixedFilter( "object.ParentSKU() = " + selection.SKU().AsQUILL()
@@ -57,6 +59,7 @@
.Add( "Unit",selection.Unit())
.Add( "CustomCode",CustomCode)
.Add( "ParentSKU",lb_SUK_FM.Text())
+ .Add( "ParentSKUName",SKUName)
.Add( "CustomName",CustomName).Build().AsString();
}
if(isnull( SelectItem))
--
Gitblit v1.9.3