Merge remote-tracking branch 'refs/remotes/origin/dev'

Administrator

2023-09-24 e528264b38b96ad2f59ba9d7ab5d5b17385cb777

 _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