From af73f90f5dbcd379e1be72144f281ca26958b41f Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期三, 25 十月 2023 09:52:50 +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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
index 8c1a8e4..c7fe0d5 100644
--- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingOperationBOMData.qbl
@@ -13,7 +13,7 @@
// yypsybs Aug-21-2023 (created)
keyProductList := construct( Strings );
if( isKeyProduct ) {
- keyProductList := selectuniquevalues( globalOTDTable, Global_MappingProduct_MP, item, item.ProductMajorType()="鎴愬搧" or item.ProductMajorType()="鍗婃垚鍝�", item.ID() );
+ keyProductList := selectuniquevalues( globalOTDTable, Global_MappingProduct_MP, item, item.ProductMajorType()="鎴愬搧" or item.ProductMajorType()="鍗婃垚鍝�", item.ID() );
}
bomList := selectsortedset( globalOTDTable, Global_MappingOperationBOM, item,
ifexpr( isnull( businessTypes ) or businessTypes.Size() = 0,
@@ -75,8 +75,15 @@
}
}
if( createPurchaseSupplyMaterial ) {
- toCreateBomList := selectuniquevalues( bomList, Elements, item,
+ toCreateBomList := construct( Strings );
+ if( isKeyProduct){
+ toCreateBomList := selectuniquevalues( bomList, Elements, item,
item.ComponentType() = "P" and keyProductList.Find( item.ComponentCode())>=0, item.OrganCode() + item.ComponentCode());
+ }else{
+ toCreateBomList := selectuniquevalues( bomList, Elements, item,
+ item.ComponentType() = "P" , item.OrganCode() + item.ComponentCode());
+
+ }
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