From 7fccbbd4d9982aaa349b36cf8031cddac610e57f Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 20 十一月 2024 15:54:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_InventoryPlanArchiveVersion/Method_Generate.qbl | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_InventoryPlanArchiveVersion/Method_Generate.qbl b/_Main/BL/Type_InventoryPlanArchiveVersion/Method_Generate.qbl
index 52dc1a3..5bcf2f4 100644
--- a/_Main/BL/Type_InventoryPlanArchiveVersion/Method_Generate.qbl
+++ b/_Main/BL/Type_InventoryPlanArchiveVersion/Method_Generate.qbl
@@ -1,7 +1,9 @@
Quintiq file version 2.0
#parent: #root
Method Generate (
- InventoryPlanArchiveVersionSearch search
+ InventoryPlanArchiveVersionSearch search,
+ Strings products,
+ Strings units
)
{
TextBody:
@@ -12,8 +14,7 @@
//娓呯┖涔嬪墠瀛樺偍鐨勬樉绀烘暟鎹�
aopcolumns := selectuniquevalues( table, Column, aopcolumn, aopcolumn.TimeUnit() = search.TimeUnit() and aopcolumn.StartDate() >= search.StartDate() and aopcolumn.StartDate() <= search.EndDate(), aopcolumn.StartDate() );
this.Clear( aopcolumns );
- traverse( table, Row, row, ( search.Unit() = FinancialProductionReport::GetDefaultAllUnit() or row.Unit() = search.Unit() )
- and ( search.Product() = FinancialProductionReport::GetDefaultAllUnit() or search.Product() = row.Name() )){
+ traverse( table, Row, row, ( units.Size() = 0 or units.Find( row.Unit() ) > -1 ) and ( products.Size() = 0 or products.Find( row.Name() ) > -1 ) ){
showrow := selectobject( this, Row, showrow, showrow.Name() = row.Name() and showrow.Unit() = search.Unit() );
if( isnull( showrow ) ){
--
Gitblit v1.9.3