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_Panel418_btn_Add_FM_OnClick#975.def |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick\043975.def" "b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick\043975.def"
index dd32915..45e0871 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick\043975.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick\043975.def"
@@ -20,12 +20,14 @@
       CustomName:="";
       SValue:="";
       SValueJsonString:="";
+      SKUName:="";
       // 鑾峰彇瀹㈡埛鍚嶇О鍜屽鎴稩D
       if(txtSaveForecastData_FM.Text().Length()>0)
       {
          jForecast := JSON::Parse( txtSaveForecastData_FM.Text());
          CustomCode := jForecast.Get( "CustomCode").GetString();
          CustomName := jForecast.Get( "CustomName").GetString();
+         SKUName := jForecast.Get( "SKUName").GetString();
       }
       if(not isnull(selection))
       {
@@ -36,6 +38,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