From c673b37d38537c136cd488b8430146573975d5e3 Mon Sep 17 00:00:00 2001 From: yanyuan <yuan.yan@capgemini.com> Date: 星期三, 01 十一月 2023 14:28:59 +0800 Subject: [PATCH] Merge branch 'dev' into dev_yy --- _Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl index 4c98455..7140c64 100644 --- a/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl +++ b/_Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl @@ -36,10 +36,11 @@ info( "Now is dealing with the " + count.AsQUILL() + "ActualPISPIP " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" ); } //product := select( globalOTDTable,Global_MappingProduct_MP,product,product.ID() = actual.ProductID() and product.KeyProduct() = nuclear,true); - if( /*not isnull( product*/ guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){ + //if( guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){ + if( not nuclear or (nuclear and actual.Global_MAPISPIPCategory().Critical() = nuclear) ){ if( not isnull(businessTypes)){ - for( i :=0 ;i < businessTypes.Size();i++ ){ + //businessType := businessTypes.Element( i ); if( /*product.BusinessType() = businessType and not product.IsCommon()*/ not actual.Global_MAPISPIPCategory().IsCommon() ){ ActualProductInStockingPointInPeriod::CreateOrUpdate( this, @@ -49,7 +50,7 @@ actual.ActualInventoryLevelEnd(), actual.ManufacturedDate()); } - } + }else{ ActualProductInStockingPointInPeriod::CreateOrUpdate( this, -- Gitblit v1.9.3