From ad81ba0fcc6ff3ca0576056bc494a110a6a691ea Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 23 十月 2024 17:50:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

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

diff --git a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
index 58c304f..f37bed3 100644
--- a/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
+++ b/_Main/BL/Type_FinancialSalesReport/Method_GenerateShow.qbl
@@ -19,7 +19,7 @@
       productid.Add( row.Name() );
       
       if( productids.ContainsAll( productid ) ){
-        showrow         := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := row.Unit() );
+        showrow         := this.FinancialSalesRow( relnew, Name := factory.Format( 'S(Len(10))' ).Concat( row.Name() ), Unit := row.Unit(), Factory := factory );
         row.Product_MP().FinancialSalesRow( relinsert, showrow );
         yearcell        := yearcolumn.FinancialSalesCell( relnew, Value := '0' );
         showrow.FinancialSalesCell( relinsert, yearcell );
@@ -42,5 +42,11 @@
         }
       }
     }
+    traverse( this, FinancialSalesColumn, column ){
+      if( exists( column, FinancialSalesCell, cell, cell.IsUpdate() ) ){
+        sumcell         := selectobject( sumrow, FinancialSalesCell, sumcell, sumcell.FinancialSalesColumn() = column );
+        sumcell.IsUpdate( true );
+      }
+    }
   *]
 }

--
Gitblit v1.9.3