From e3230655411dda675ce50a2daf54fd5cffacb883 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 21 十一月 2024 18:23:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
index 3a803ad..7c5d964 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/StaticMethod_RefreshData.qbl
@@ -11,7 +11,7 @@
//鏍规嵁褰撳墠鐗堟湰鐨勪笅绾胯鍒�
allunit := OfflinePlanArchiveVersion::GetDefaultAllUnit();
name := OfflinePlanArchiveVersion::GetDefaultName();
- search := interface.OfflinePlanArchiveSearch( relnew, Product := allunit, ProductionLine := allunit, TimeUnit := Translations::MP_GlobalParameters_Day(), Unit := allunit, StartDate := Date::MinDate(), EndDate := Date::MaxDate() );
+ 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 );
@@ -20,7 +20,7 @@
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.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcolumn.StartDate() ), nopcolumn.StartDate() );
+ 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 );
}
@@ -38,7 +38,7 @@
row := table.GetRow( noprow );
if( not isnull( row ) ){
traverse( noprow, NewOfflinePlanCell, nopcell ){
- column := selectobject( table, Column, column, column.TimeUnit() = Translations::MP_GlobalParameters_Day() and column.StartDate() = nopcell.NewOfflinePlanColumn().StartDate() );
+ column := selectobject( table, Column, column, column.StartDate() = nopcell.NewOfflinePlanColumn().StartDate() );//column.TimeUnit() = Translations::MP_GlobalParameters_Day() and
cell := selectobject( row, Cell, cell, cell.Column() = column );
actproductionKey := noprow.ProductID() + column.StartDate().AsQUILL();
actproductionhandle:= actproductiontree.GetHandle( actproductionKey );
--
Gitblit v1.9.3