From e528264b38b96ad2f59ba9d7ab5d5b17385cb777 Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期日, 24 九月 2023 18:58:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
index c03f661..1b87aa1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
@@ -15,21 +15,18 @@
[*
// 鑾峰彇閫夋嫨鍚庣殑SKU
SelectItem := select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmMaterial" and Obj.ItemKey()="ListSelect");
- if(not isnull( SelectItem) and SelectItem.Value().Length()>0)
+ if(not isnull( SelectItem))
{
- StrValue := SelectItem.Value().Tokenize( ";");
- lb_SUK_FAACM.Text(StrValue.Element( 0));
- lb_MaterialCode_FAACM.Text(StrValue.Element( 1));
- lb_Unit_FAACM.Text(StrValue.Element( 2));
- lb_Operator_FAACM.Text(ApplicationMacroPlanner.GetUserName());
- }
- // 鑾峰彇閫夋嫨鍚庣殑SKU
- SelectItem := select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmOrderForecast" and Obj.ItemKey()="ListSelect");
- if(not isnull( SelectItem) and SelectItem.Value().Length()>0)
- {
- StrValue := SelectItem.Value().Tokenize( ";");
- txt_CustomID_FAACM.Text(StrValue.Element( 2));
- txt_CustomName_FAACM.Text(StrValue.Element( 3));
+ if(SelectItem.ValueJsonString().Length()>0)
+ {
+ JInfo := JSON::Parse( SelectItem.ValueJsonString());
+ lb_SUK_FAACM.Text(JInfo.Get( "ParentSKU").GetString());
+ lb_MaterialCode_FAACM.Text(JInfo.Get( "SKU").GetString());
+ lb_Unit_FAACM.Text(JInfo.Get( "Unit").GetString());
+ lb_Operator_FAACM.Text(ApplicationMacroPlanner.GetUserName());
+ txt_CustomID_FAACM.Text(JInfo.Get( "CustomCode").GetString());
+ txt_CustomName_FAACM.Text(JInfo.Get( "CustomName").GetString());
+ }
}
*]
GroupServerCalls: false
--
Gitblit v1.9.3