From 9d9b7d6217f0118025f68339f37ad54ae50cf346 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期二, 22 十月 2024 18:17:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
index 36d1094..43dbe28 100644
--- a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
@@ -25,7 +25,7 @@
if( isnull( unitrow ) ){
unitrow := table.FinancialSalesRow( relnew, Name := product.Value(), Unit := unit.Value() );
}
- allrow := selectobject( table, FinancialSalesRow, allrow, allrow.Name() = product.Value() and allrow.Unit() = allunit );
+ allrow := selectobject( table, FinancialSalesRow, allrow, allrow.Name() = product.Value() and allrow.Unit() = allunit );
if( isnull( unitrow ) ){
allrow := table.FinancialSalesRow( relnew, Name := product.Value(), Unit := allunit );
}
@@ -41,7 +41,7 @@
if( isnull( tablecolumn ) ){
tablecolumn := table.FinancialSalesColumn( relnew, Name := periodname, Period := yearday.Date() );
}
- unitcell := selectobject( unitrow, FinancialSalesCell, unitcell, unitcell.FinancialSalesColumn().Name() = column.Name() );
+ unitcell := selectobject( unitrow, FinancialSalesCell, unitcell, unitcell.FinancialSalesColumn() = tablecolumn );
if( isnull( unitcell ) ){
unitcell := tablecolumn.FinancialSalesCell( relnew, Value := cell.Value() );
unitrow.FinancialSalesCell( relinsert, unitcell );
@@ -51,12 +51,12 @@
previouscell := selectobject( row, FinancialSalesCell, previouscell, previouscell.FinancialSalesColumn() = previouscolumn );
quantity := [Real]cell.Value() + [Real]previouscell.Value();
if( [Real]unitcell.Value() <> quantity ){
- unitcell.Value( [String]( [Number]cell.Value() ) );
+ unitcell.Value( [String]( [Number]quantity ) );
unitcell.IsUpdate( true );
}
}
}
- allcell := selectobject( allrow, FinancialSalesCell, allcell, allcell.FinancialSalesColumn().Name() = column.Name() );
+ allcell := selectobject( allrow, FinancialSalesCell, allcell, allcell.FinancialSalesColumn() = tablecolumn );
if( isnull( unitcell ) ){
allcell := tablecolumn.FinancialSalesCell( relnew, Value := cell.Value() );
allrow.FinancialSalesCell( relinsert, allcell );
@@ -66,7 +66,7 @@
previouscell := selectobject( row, FinancialSalesCell, previouscell, previouscell.FinancialSalesColumn() = previouscolumn );
quantity := [Real]cell.Value() + [Real]previouscell.Value();
if( [Real]allcell.Value() <> quantity ){
- allcell.Value( [String]( [Number]cell.Value() ) );
+ allcell.Value( [String]( [Number]quantity ) );
allcell.IsUpdate( true );
}
}
--
Gitblit v1.9.3