From a67dc2f0b8dd2803982cfa9c6ea42b77c191d22c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 11 十一月 2024 12:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
index a57f712..2abd5c6 100644
--- a/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
+++ b/_Main/BL/Type_FinancialSalesSource/Method_AfterImport.qbl
@@ -25,10 +25,6 @@
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 );
- // if( isnull( unitrow ) ){
- // allrow := table.FinancialSalesRow( relnew, Name := product.Value(), Unit := allunit );
- // }
traverse( row, FinancialSalesCell, cell, cell.Value() <> '0' and cell.FinancialSalesColumn() <> productcolumn and cell.FinancialSalesColumn() <> unitcolumn and cnv2.Convert( cell.FinancialSalesColumn().Name() ) <> beforeyearday ){
column := cell.FinancialSalesColumn();
@@ -42,7 +38,7 @@
}
tablecolumn := construct( FinancialSalesColumn );
//鑾峰彇琚鍏ユ姤琛ㄧ殑鏃ユ湡鍒�
- tablecolumn := selectobject( table, FinancialSalesColumn, fscolumn, not fscolumn.IsDay() and fscolumn.Name() = periodname );
+ tablecolumn := selectobject( table, FinancialSalesColumn, fscolumn, fscolumn.Name() = periodname );
if( isnull( tablecolumn ) ){
tablecolumn := table.FinancialSalesColumn( relnew, Name := periodname, Period := yearday.Date() );
}
@@ -56,16 +52,6 @@
unitcell.IsUpdate( true );
}
}
- // allcell := selectobject( allrow, FinancialSalesCell, allcell, allcell.FinancialSalesColumn() = tablecolumn );
- // if( isnull( allcell ) ){
- // allcell := tablecolumn.FinancialSalesCell( relnew, Value := cell.Value() );
- // allrow.FinancialSalesCell( relinsert, allcell );
- // }else{
- // if( [Real]allcell.Value() <> quantity ){
- // allcell.Value( [String]( [Number]quantity ) );
- // allcell.IsUpdate( true );
- // }
- // }
}
}
}
--
Gitblit v1.9.3