From aaf2ba51aa969af7d2d8920d59c8a184393e21b4 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期三, 13 九月 2023 22:09:55 +0800
Subject: [PATCH] product 过滤有问题
---
_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl | 2 --
_Main/BL/Type_MacroPlan/Method_MappingProductData.qbl | 6 +++---
_Main/BL/Type_MacroPlan/Method_InitialUnitAndStockingPoint.qbl | 6 ++++++
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_InitialUnitAndStockingPoint.qbl b/_Main/BL/Type_MacroPlan/Method_InitialUnitAndStockingPoint.qbl
index d030255..c71e147 100644
--- a/_Main/BL/Type_MacroPlan/Method_InitialUnitAndStockingPoint.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_InitialUnitAndStockingPoint.qbl
@@ -106,5 +106,11 @@
ProductLevel_MP::Create( "2", isproductcatagory, this, isfromdb );
ProductLevel_MP::Create( "3", isproductcatagory, this, isfromdb );
}
+
+ existsalestlevel := SalesLevel_MP::FindSalesLevelTypeIndex( "2")
+ if( isnull( existsalestlevel ) ){
+ SalesLevel_MP::Create( "1",this,isfromdb);
+ SalesLevel_MP::Create( "2",this,isfromdb);
+ }
*]
}
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
index abb42d6..1bdf79c 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl
@@ -53,8 +53,6 @@
}
- }else{
- info( "Invaild product" );
}
}
*]
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingProductData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingProductData.qbl
index 492ebce..547f0bf 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingProductData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingProductData.qbl
@@ -10,7 +10,7 @@
[*
// Administrator Aug-16-2023 (created)
// list to deal
- //info( "Get list to deal of product" );
+ info( "Get list to deal of product" );
listToDeal := construct( structured[MappingProduct] );
if( isnull( businesstypes ) or businesstypes.Size() = 0 ) {
@@ -22,10 +22,10 @@
}
} else {
if( iskeyproduct = true ){
- listToDeal := selectset( this, MappingProduct, item, item.KeyProduct() = true, businesstypes.Find( item.BusinessType()) > 0 );
+ listToDeal := selectset( this, MappingProduct, item, item.KeyProduct() = true and businesstypes.Find( item.BusinessType()) >= 0 );
}
else{
- listToDeal := selectset( this, MappingProduct, item, businesstypes.Find( item.BusinessType()) > 0 );
+ listToDeal := selectset( this, MappingProduct, item, businesstypes.Find( item.BusinessType()) >= 0 );
}
}
totalcount := listToDeal.Size();
--
Gitblit v1.9.3