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_CustomerDemandIDS/Method_Generate.qbl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl b/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl
index 80c7eae..454d677 100644
--- a/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl
+++ b/_Main/BL/Type_CustomerDemandIDS/Method_Generate.qbl
@@ -1,7 +1,8 @@
 Quintiq file version 2.0
 #parent: #root
 Method Generate (
-  CustomerDemandIDSSearch search
+  CustomerDemandIDSSearch search,
+  Strings products
 )
 {
   TextBody:
@@ -13,7 +14,7 @@
     idscolumns              := selectuniquevalues(  table, Column, idscolumn, idscolumn.TimeUnit() = search.TimeUnit() and idscolumn.StartDate() >= search.StartDate() and idscolumn.StartDate() <= search.EndDate(), idscolumn.StartDate() );
     this.Clear( idscolumns );
     traverse( table, Row, row, ( search.Unit() = FinancialProductionReport::GetDefaultAllUnit() or row.Factory() = search.Unit() ) 
-              and ( search.Product() = FinancialProductionReport::GetDefaultAllUnit() or search.Product() = row.Name() ) ){
+              and ( products.Size() = 0 or products.Find( row.Name() ) > -1 ) ){
       
       showrow               := selectobject( this, Row, showrow, showrow.Name() = row.Name() and showrow.Factory() = search.Unit() );
       if( isnull( showrow ) ){

--
Gitblit v1.9.3