From 76c7b6120bb5a3076a31f3c3eb7e068f290f68d3 Mon Sep 17 00:00:00 2001
From: limj <limj@taizhitech.com>
Date: 星期一, 25 九月 2023 20:47:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lmj

---
 _Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
index a76472b..1b87aa1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def
@@ -17,22 +17,16 @@
       SelectItem := select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmMaterial" and Obj.ItemKey()="ListSelect");
       if(not isnull( SelectItem))
       {
-        if(SelectItem.Value().Length()>0)
+        if(SelectItem.ValueJsonString().Length()>0)
         {
-          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));
+          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());
         }
-      }
-      // 鑾峰彇閫夋嫨鍚庣殑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));
       }
     *]
     GroupServerCalls: false

--
Gitblit v1.9.3