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_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
index 7c5d964..e4fee3e 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
@@ -10,16 +10,16 @@
   [*
     //鏍规嵁褰撳墠鐗堟湰鐨勪笅绾胯鍒�
     allunit                := OfflinePlanArchiveVersion::GetDefaultAllUnit();
-    name                   := OfflinePlanArchiveVersion::GetDefaultName();
-    search                 := interface.OfflinePlanArchiveSearch( relnew, Product := allunit, ProductionLine := allunit, Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );//, TimeUnit := Translations::MP_GlobalParameters_Day()
+    name                   := OfflinePlanArchiveVersion::GetDefaultName();//search                 := 
+    interface.OfflinePlanArchiveSearch( relnew, Product := allunit, ProductionLine := allunit, Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );//, TimeUnit := Translations::MP_GlobalParameters_Day()
     table                  := selectobject( interface, OfflinePlanArchiveVersion, version, not version.IsShow() );
     if( isnull( table ) ){
       table                := interface.OfflinePlanArchiveVersion( relnew, ID := name, Name := name );
     }
-    showtable              := selectobject( interface, OfflinePlanArchiveVersion, version, version.IsShow() );
-    if( isnull( showtable ) ){
-      showtable               := interface.OfflinePlanArchiveVersion( relnew, ID := name, Name := name, IsShow := true );
-    }
+    //showtable              := selectobject( interface, OfflinePlanArchiveVersion, version, version.IsShow() );
+    //if( isnull( showtable ) ){
+    //  showtable               := interface.OfflinePlanArchiveVersion( relnew, ID := name, Name := name, IsShow := true );
+    //}
     nopcolumns             := selectuniquevalues(  macroPlan, NewOfflinePlanTable.NewOfflinePlanColumn, nopcolumn, not exists( table, Column, column, column.StartDate() = nopcolumn.StartDate() ), nopcolumn.StartDate() );//column.TimeUnit() = Translations::MP_GlobalParameters_Day() and 
     if( nopcolumns.Size() > 0 ){
       table.GenerateColumn( nopcolumns, false );
@@ -60,8 +60,8 @@
         }
       }
     }
-    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