From d47b2a6610c16b6db7fa991f6064d990085b65f3 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期五, 22 十一月 2024 17:14:37 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl index 4f1ee1c..edb6767 100644 --- a/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl +++ b/_Main/BL/Type_AssemblyOnlinePlanVersion/StaticMethod_RefreshData.qbl @@ -10,16 +10,16 @@ //鏍规嵁褰撳墠鐗堟湰鐨勮閰嶄笂绾胯鍒� interface.AssemblyOnlinePlanVersion( relflush ); allunit := AssemblyOnlinePlanVersion::GetDefaultAllUnit(); - name := AssemblyOnlinePlanVersion::GetDefaultName();//search := - search := interface.AssemblyOnlinePlanVersionSearch( relnew, Product := allunit, ProductionLine := allunit, Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );//, TimeUnit := Translations::MP_GlobalParameters_Day() + name := AssemblyOnlinePlanVersion::GetDefaultName();//search := + interface.AssemblyOnlinePlanVersionSearch( relnew, Product := allunit, ProductionLine := allunit, Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );//, TimeUnit := Translations::MP_GlobalParameters_Day() table := selectobject( interface, AssemblyOnlinePlanVersion, version, not version.IsShow() ); if( isnull( table ) ){ table := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name ); } - showtable := selectobject( interface, AssemblyOnlinePlanVersion, version, version.IsShow() ); - if( isnull( showtable ) ){ - showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true ); - } + //showtable := selectobject( interface, AssemblyOnlinePlanVersion, version, version.IsShow() ); + //if( isnull( showtable ) ){ + // showtable := interface.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true ); + //} aopcolumns := selectuniquevalues( macroPlan, NewAssemblyOnlinePlanColumn, aopcolumn, not exists( table, Column, column, column.StartDate() = aopcolumn.StartDate() ), aopcolumn.StartDate() );//, column.TimeUnit() = Translations::MP_GlobalParameters_Day() if( aopcolumns.Size() > 0 ){ table.GenerateColumn( aopcolumns, false ); @@ -34,8 +34,8 @@ cell.Quantity( qty ); } } - productids := selectuniquevalues( table, Row, row, row.Name() ); - productlines := selectuniquevalues( table, Row, row, row.ProductionLine() ); - showtable.Generate( search, productids, productlines ); + //productids := selectuniquevalues( table, Row, row, row.Name() ); + //productlines := selectuniquevalues( table, Row, row, row.ProductionLine() ); + //showtable.Generate( search, productids, productlines ); *] } -- Gitblit v1.9.3