From 628700bb251d908486dd24dc225e5c9ac2cfada8 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 08 十月 2024 15:29:09 +0800
Subject: [PATCH] 财务产量/销量报表添加年汇总和往前串一天

---
 _Main/BL/Type_FinancialSalesReport/Method_Generate.qbl |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/_Main/BL/Type_FinancialSalesReport/Method_Generate.qbl b/_Main/BL/Type_FinancialSalesReport/Method_Generate.qbl
index 4c67240..d62492f 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_Generate.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_Generate.qbl
@@ -12,17 +12,23 @@
     allunit    := '<All>';
     //娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
     this.Clear();
+    //骞存眹鎬�
+    yearcolumn := this.FinancialSalesColumn( relnew, Name := '姹囨��', Period := search.MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
     //杩囨护鍚庣殑浜у搧id
     productids := selectuniquevalues( products, Elements, product, ( search.Generation() = allunit or product.Generation() = search.Generation() )
                                       and ( search.MqbMlb() = allunit or product.MQBMLB() = search.MqbMlb() )
                                       and ( search.Power() = allunit or product.Power() = search.Power() ), product.ID() );
     sumrow     := this.FinancialSalesRow( relnew, Name := 'SUM', Unit := search.Unit(), RowNr := table.FinancialSalesRow( relsize ) );
+    sumyearcell := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
+    sumrow.FinancialSalesCell( relinsert, sumyearcell );
     traverse( table, FinancialSalesRow, row, row.Unit() = search.Unit() ){
       productid  := construct( Strings );
       productid.Add( row.Name() );
       
       if( productids.ContainsAll( productid ) ){
         showrow := this.FinancialSalesRow( relnew, Name := row.Name(), Unit := row.Unit(), RowNr := row.RowNr() );
+        yearcell := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
+        showrow.FinancialSalesCell( relinsert, yearcell );
         
         traverse( row, FinancialSalesCell, cell, not cell.FinancialSalesColumn().IsDay() ){
           column   := selectobject( this, FinancialSalesColumn, column, column.Name() = cell.FinancialSalesColumn().Name() and not column.IsDay());
@@ -35,6 +41,8 @@
           
           showcell := column.FinancialSalesCell( relnew, Value := cell.Value() );
           showrow.FinancialSalesCell( relinsert, showcell );
+          yearcell.Value( [String]( [Real]yearcell.Value() + [Real]cell.Value() ) );
+          sumyearcell.Value( [String]( [Real]sumyearcell.Value() + [Real]cell.Value() ) );
           value := [Real]cell.Value() + [Real]sumcell.Value();
           sumcell.Value( [String]value );
         }

--
Gitblit v1.9.3