Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

Tianma21

2023-10-08 1b0f461e0db93c3f504b8be975a5b7ffddbcc584

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def

@@ -18,6 +18,7 @@
        {
           MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                       ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "CustomName",selection.CustomName())
@@ -28,6 +29,7 @@
        else
        {
          SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                                   .Add( "SKUName",selection.SKUName())
                                                   .Add( "Util",selection.Unit())
                                                   .Add( "CustomCode",selection.CustomCode())
                                                   .Add( "CustomName",selection.CustomName())
@@ -36,7 +38,7 @@
                                                   .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
        }
        
        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month());
        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable);
        if(jResult.Get( "Status").GetBoolean())
        {
            Application.OpenForm( "FrmMaterial","popout");