From 4534d2c0921049d9d150ba0c31f76cb445bdd365 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 21 十一月 2024 17:41:25 +0800
Subject: [PATCH] 存档报表界面去掉日期区分列

---
 _Main/BL/Type_OfflinePlanArchiveVersion/Method_Generate.qbl |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_Generate.qbl b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_Generate.qbl
index e97dc5c..0d1a11e 100644
--- a/_Main/BL/Type_OfflinePlanArchiveVersion/Method_Generate.qbl
+++ b/_Main/BL/Type_OfflinePlanArchiveVersion/Method_Generate.qbl
@@ -12,7 +12,7 @@
     info( '-----------Search start-------' );
     table                   := selectobject( this,InterfaceDataset.OfflinePlanArchiveVersion, report, not report.IsShow() );
     //娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
-    aopcolumns              := selectuniquevalues(  table, Column, aopcolumn, aopcolumn.TimeUnit() = search.TimeUnit() and aopcolumn.StartDate() >= search.StartDate() and aopcolumn.StartDate() <= search.EndDate(), aopcolumn.StartDate() );
+    aopcolumns              := selectuniquevalues(  table, Column, aopcolumn, aopcolumn.StartDate() >= search.StartDate() and aopcolumn.StartDate() <= search.EndDate(), aopcolumn.StartDate() );//aopcolumn.TimeUnit() = search.TimeUnit() and 
     this.Clear( aopcolumns );
     traverse( table, Row, row, ( units.Size() = 0 or units.Find( row.ProductionLine() ) > -1 ) and ( products.Size() = 0 or products.Find( row.Name() ) > -1 ) ){
       
@@ -21,9 +21,7 @@
         showrow             := this.Row( relnew, Name := row.Name(), ProductID := row.ProductID(), Unit := search.Unit() );
       }
       traverse( this, Column, column ){
-        cells               := selectset( row, Cell, cell, cell.Column().TimeUnit() = Translations::MP_GlobalParameters_Day() 
-                                          and cell.Column().StartDate() >= column.StartDate()
-                                          and cell.Column().StartDate() <= column.EndDate() );
+        cells               := selectset( row, Cell, cell, cell.Column().StartDate() >= column.StartDate() and cell.Column().StartDate() <= column.EndDate() );//cell.Column().TimeUnit() = Translations::MP_GlobalParameters_Day() and 
         
     //  traverse( row, Cell, cell, cell.Column().TimeUnit() = search.TimeUnit() ){
     //    column              := selectobject( this, Column, column, column.ColumnName() = cell.Column().ColumnName() );
@@ -37,10 +35,10 @@
           actqty            := sum( cells, Elements, cell, cell.ActualProductionQty() );
           showcell.Quantity( qty + showcell.Quantity() );
           showcell.ActualProductionQty( actqty + showcell.ActualProductionQty() );
-          if( search.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
+    //      if( search.TimeUnit() = Translations::MP_GlobalParameters_Day() ){
             showcell.Order( cells.Element( 0 ).Order() );
             showcell.OrderNr( cells.Element( 0 ).OrderNr() );
-          }
+    //      }
         }
       }
     }

--
Gitblit v1.9.3