From c4d51a686d53f51cefaaf382cac999165d0ceb6a Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期二, 12 九月 2023 17:30:43 +0800
Subject: [PATCH] 分发BusinessType修改
---
_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl | 6 +++---
_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl | 5 +++--
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 3 ++-
_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl | 4 ++--
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 93b5707..2675518 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -17,7 +17,8 @@
bomList := selectsortedset( this, MappingBOM, item,
ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0,
true,
- businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0 )
+ // businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0 )
+ businessTypes.Find( item.BusinessType() ) >= 0 )
and ifexpr( isKeyProduct,
keyProductList.Size() > 0 and keyProductList.Find( item.ComponentCode() ) >= 0,
true ),
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
index a3a19ed..2c50193 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationData.qbl
@@ -11,8 +11,8 @@
toDealList := construct( MappingOperations );
if( not isnull( businessTypes ) and businessTypes.Size() > 0 ) {
toDealList := selectsortedset( this, MappingOperation, item,
- // businessTypes.Find( item.BusinessType() ) >= 0,
- businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0,
+ businessTypes.Find( item.BusinessType() ) >= 0,
+ // businessTypes.Difference( businessTypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0,
item.SequenceNumber() );
} else {
toDealList := selectsortedset( this, MappingOperation, item,
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
index fa613b6..1d4688b 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
@@ -15,8 +15,9 @@
listtodeal := selectset( this, MappingOperation, item, true );
} else {
listtodeal := selectset( this, MappingOperation, item,
- businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
- );
+ // businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
+ businesstypes.Find( item.BusinessType() ) >= 0
+ );
}
//Set the Default values
diff --git a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
index 01c62e7..cd08867 100644
--- a/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
+++ b/_Main/BL/Type_MacroPlan/StaticMethod_DoSync0.qbl
@@ -130,9 +130,9 @@
// 搴撳瓨鎴愭湰-15
InventoryValueAndCost::DoSync( macroPlan );
- //// todo 鍒堕�犳垚鏈�-16
- //info( "InventoryCost Finished, Start OperationCost Mapping" );
- //macroPlan.MappingOperationCostData( businessTypes );
+ // todo 鍒堕�犳垚鏈�-16
+ info( "InventoryCost Finished, Start OperationCost Mapping" );
+ macroPlan.MappingOperationCostData( businessTypes );
// 璁㈠崟棰勬祴-17
Forecast::DoSync( macroPlan, businessTypes );
--
Gitblit v1.9.3