From b02a3586a97064c94087c0e3ca2eac36cd9d9b42 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 21 十月 2024 17:36:04 +0800
Subject: [PATCH] 库存汇总报表导出格式修改

---
 _Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
index 712aafb..58c304f 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
@@ -10,33 +10,34 @@
   [*
     // 鐢勫叞楦� Oct-12-2024 (created)
     //骞存眹鎬�
-    yearcolumn := this.FinancialSalesColumn( relnew, Name := '姹囨��', Period := this.FinancialSalesSource().MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
-    sumrow     := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( 'SUM' ), Unit := factory, RowNr := table.FinancialSalesRow( relsize ) );
-    sumyearcell := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
+    yearcolumn          := this.FinancialSalesColumn( relnew, Name := '姹囨��', Period := this.FinancialSalesSource().MacroPlan().StartOfPlanning().StartOfNextYear().Date() );
+    sumrow              := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( 'SUM' ), Factory := factory );
+    sumyearcell         := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
     sumrow.FinancialSalesCell( relinsert, sumyearcell );
     traverse( table, FinancialSalesRow, row, row.Unit() = factory ){
-      productid  := construct( Strings );
+      productid         := construct( Strings );
       productid.Add( row.Name() );
       
       if( productids.ContainsAll( productid ) ){
-        showrow := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := row.Unit(), RowNr := row.RowNr() );
-        yearcell := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
+        showrow         := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := row.Unit() );
+        row.Product_MP().FinancialSalesRow( relinsert, showrow );
+        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());
+          column        := selectobject( this, FinancialSalesColumn, column, column.Name() = cell.FinancialSalesColumn().Name() and not column.IsDay());
           
-          sumcell  := selectobject( column, FinancialSalesCell, c, c.FinancialSalesRow() = sumrow );
+          sumcell       := selectobject( column, FinancialSalesCell, c, c.FinancialSalesRow() = sumrow );
           if( isnull( sumcell ) ){
-            sumcell := column.FinancialSalesCell( relnew, Value := '0' );
+            sumcell     := column.FinancialSalesCell( relnew, Value := '0' );
             sumrow.FinancialSalesCell( relinsert, sumcell );
           }
           
-          showcell := column.FinancialSalesCell( relnew, Value := cell.Value(), IsUpdate := cell.IsUpdate()  );
+          showcell      := column.FinancialSalesCell( relnew, Value := cell.Value(), IsUpdate := cell.IsUpdate()  );
           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();
+          value         := [Real]cell.Value() + [Real]sumcell.Value();
           sumcell.Value( [String]value );
         }
       }

--
Gitblit v1.9.3