From 5be1a4f56ab08d96dfae922ef4eb2ce74a7fabeb Mon Sep 17 00:00:00 2001 From: hongji.li <hongji.a.li@capgemini.com> Date: 星期三, 13 九月 2023 10:55:09 +0800 Subject: [PATCH] Merge branch 'dev_release' into dev --- _Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl index 7295bad..ea2ad61 100644 --- a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl +++ b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl @@ -9,15 +9,14 @@ [* // renhao Aug-14-2023 (created) - listtodeal := selectset( this,MappingExternalSupply,externalSupply, - not isnull( StockingPoint_MP::FindById( this, externalSupply.StockingPointID() ) ) and not isnull( Product_MP::FindById( this, externalSupply.ProductID() ) ) ); + listtodeal := selectset( this,MappingExternalSupply,externalSupply, true ); totalcount := listtodeal.Size(); info( "ExternalSupply has " + totalcount.AsQUILL() + " rows in total" ); count := 0; traverse( listtodeal,Elements,externalSupply){ count := count + 1; - if( count - [Number](count/100) * 100 = 0 or count = totalcount ){ + if( count - [Number](count/1000) * 1000 = 0 or count = totalcount ){ info( "Now is dealing with the " + count.AsQUILL() + "ExternalSupply " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" ); } product := select( this,MappingProduct,product,product.ID() = externalSupply.ProductID() and product.KeyProduct() = nuclear,true); -- Gitblit v1.9.3