From ae5ce946294a27532534b52bd21d37567d4a6887 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 25 十月 2023 18:06:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
index c7fe0d5..03a2581 100644
--- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
@@ -76,14 +76,22 @@
}
if( createPurchaseSupplyMaterial ) {
toCreateBomList := construct( Strings );
+ alterCodes := construct( Strings );
+
if( isKeyProduct){
toCreateBomList := selectuniquevalues( bomList, Elements, item,
item.ComponentType() = "P" and keyProductList.Find( item.ComponentCode())>=0, item.OrganCode() + item.ComponentCode());
+
+ alterCodes := selectuniquevalues( bomList, Elements, item,
+ not item.AlternativeMaterialCode() = "" and item.AlternativeMaterialType() = "P" and keyProductList.Find( item.ComponentCode())>=0, item.OrganCode() + item.AlternativeMaterialCode());
}else{
toCreateBomList := selectuniquevalues( bomList, Elements, item,
item.ComponentType() = "P" , item.OrganCode() + item.ComponentCode());
- }
+ alterCodes := selectuniquevalues( bomList, Elements, item,
+ not item.AlternativeMaterialCode() = "" and item.AlternativeMaterialType() = "P", item.OrganCode() + item.AlternativeMaterialCode());
+ }
+ toCreateBomList := toCreateBomList.Union( alterCodes);
traverse( toCreateBomList, Elements, key ) {
boms := selectset( bomList, Elements, item, item.ComponentType() = "P" and item.OrganCode() + item.ComponentCode() = key );
bom := boms.First();
--
Gitblit v1.9.3