From 84fb41965e8c677d998ad2a6fc4ecc93b6ec2be8 Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期五, 13 十月 2023 11:00:40 +0800
Subject: [PATCH] Merge branch 'dev_hrh_global'
---
_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl | 2 +-
_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl | 2 +-
_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl
index 9385366..a8db6ce 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl
@@ -24,7 +24,7 @@
if( count - [Number](count/1000) * 1000 = 0 or count = totalcount ){
info( "Now is dealing with the " + count.AsQUILL() + "ActualPISPIP " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" );
}
- product := select( this,MappingProduct,product,product.ID() = actual.ProductID() and product.KeyProduct() = nuclear,true);
+ product := select( globalOTDTable,Global_MappingProduct_MP,product,product.ID() = actual.ProductID() and product.KeyProduct() = nuclear,true);
if( not isnull( product)){
if( not isnull(businessTypes)){
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
index 208a5e8..6dd9ddc 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationBOMData.qbl
@@ -76,7 +76,7 @@
}
if( createPurchaseSupplyMaterial ) {
toCreateBomList := selectuniquevalues( bomList, Elements, item,
- item.ComponentType() = "P", item.OrganCode() + item.ComponentCode());
+ item.ComponentType() = "P" and keyProductList.Find( item.ComponentCode())>=0, 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();
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
index f3118cb..05f843b 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitOfMeasureData.qbl
@@ -10,7 +10,7 @@
// yypsybs Aug-15-2023 (created)
defaultOld := UnitOfMeasure_MP::FindDefault( this );
- defaultNew := select( this, MappingUnitOfMeasure, item, true, item.IsDefault() );
+ defaultNew := select( globalotdtable, Global_MappingUnitOfMeasure_MP, item, true, item.IsDefault() );
if( not isnull( defaultOld ) and not isnull( defaultNew )
and defaultOld.Name() <> defaultNew.Name() ) {
--
Gitblit v1.9.3