From 67ff28f43d635a3728bb7d39364a9c6f8345912b Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期四, 07 九月 2023 11:34:34 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj --- _Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl index d4b8493..87cbdf3 100644 --- a/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl +++ b/_Main/BL/Type_MacroPlan/Method_MappingActualPISPIPData.qbl @@ -9,12 +9,12 @@ [* // renhao Aug-14-2023 (created) date := Date :: Today(); - listtodeal := selectset( this,MappingActualPISPIP,actual,true ); + listtodeal := selectset( this,MappingActualPISPIP,actual,not isnull( Product_MP::FindById( this, actual.ProductID() ) ) ); totalcount := listtodeal.Size(); info( "ActualPISPIP has " + totalcount.AsQUILL() + " rows in total" ); count := 0; - traverse( this,MappingActualPISPIP,actual){ + traverse( listtodeal,Elements,actual){ count := count + 1; if( count - [Number](count/100) * 100 = 0 or count = totalcount ){ info( "Now is dealing with the " + count.AsQUILL() + "ActualPISPIP " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" ); @@ -26,14 +26,22 @@ for( i :=0 ;i < businessTypes.Size();i++ ){ businessType := businessTypes.Element( i); if( product.BusinessType() = businessType and not product.IsCommon()){ - ActualProductInStockingPointInPeriod::Create( this,actual.ProductID(),actual.StockingPointID(),actual.Description(),actual.ActualInventoryLevelEnd(), - date,actual.ManufacturedDate(),true); + ActualProductInStockingPointInPeriod::CreateOrUpdate( this, + actual.ProductID(), + actual.StockingPointID(), + actual.Description(), + actual.ActualInventoryLevelEnd(), + actual.ManufacturedDate()); } } }else{ - ActualProductInStockingPointInPeriod::Create( this,actual.ProductID(),actual.StockingPointID(),actual.Description(),actual.ActualInventoryLevelEnd(), - date,actual.ManufacturedDate(),true); + ActualProductInStockingPointInPeriod::CreateOrUpdate( this, + actual.ProductID(), + actual.StockingPointID(), + actual.Description(), + actual.ActualInventoryLevelEnd(), + actual.ManufacturedDate()); } } -- Gitblit v1.9.3