From fac42cac462a926494eabc6ac7be78837931d5a4 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 07 十一月 2024 12:07:52 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_InventoryPlanArchiveVersion/StaticMethod_GenerateData.qbl | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_InventoryPlanArchiveVersion/StaticMethod_GenerateData.qbl b/_Main/BL/Type_InventoryPlanArchiveVersion/StaticMethod_GenerateData.qbl
index 33f3c3f..9909a0e 100644
--- a/_Main/BL/Type_InventoryPlanArchiveVersion/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_InventoryPlanArchiveVersion/StaticMethod_GenerateData.qbl
@@ -12,18 +12,18 @@
info( '-------------------------Start---------------------');
allunit := AssemblyOnlinePlanVersion::GetDefaultAllUnit();
name := InventoryPlanArchiveVersion::GetDefaultName();
- interfaceDataset.InventoryPlanArchiveVersionSearch( relnew, Product := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ search := interfaceDataset.InventoryPlanArchiveVersionSearch( relnew, Product := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
table := selectobject( interfaceDataset, InventoryPlanArchiveVersion, version, not version.IsShow() );
if( isnull( table ) ){
table := interfaceDataset.InventoryPlanArchiveVersion( relnew, ID := name, Name := name );
}
- //showtable := selectobject( interfaceDataset, InventoryPlanArchiveVersion, version, version.IsShow() );
- //if( isnull( table ) ){
- // showtable := interfaceDataset.AssemblyOnlinePlanVersion( relnew, ID := name, Name := name, IsShow := true );
- //}
+ showtable := selectobject( interfaceDataset, InventoryPlanArchiveVersion, version, version.IsShow() );
+ if( isnull( table ) ){
+ showtable := interfaceDataset.InventoryPlanArchiveVersion( relnew, ID := name, Name := name, IsShow := true );
+ }
periods := selectuniquevalues( macroPlan, Period_MP, period, not period.IsHistorical() and period.TimeUnit() = Translations::MP_GlobalParameters_Day()
and not exists( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = period.StartDate() ), period.StartDate() );
- table.GenerateColumn( periods );
+ table.GenerateColumn( periods, false );
actinventorytree := NamedValueTree::Create();
inventoryqrys := construct( Reals );
inventoryindex := 0;
@@ -68,5 +68,6 @@
}
info( '-------------------------End---------------------');
+ showtable.Generate( search );
*]
}
--
Gitblit v1.9.3