From e7c56c4676e153f0af05083b1f5ab0ed73d4b2c3 Mon Sep 17 00:00:00 2001 From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com> Date: 星期四, 12 十月 2023 19:19:53 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin --- _Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl index 39675d3..4db0d6c 100644 --- a/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl +++ b/_Main/BL/Type_MacroPlan/Method_MappingExternalSupplyData.qbl @@ -3,7 +3,8 @@ Method MappingExternalSupplyData ( Strings businessTypes, Boolean nuclear, - GlobalOTDTable globalOTDTable + GlobalOTDTable globalOTDTable, + Strings organcodelist ) { TextBody: @@ -11,7 +12,6 @@ // renhao Aug-14-2023 (created) queryStartDate := guard( min( this, Period_MP, item, true, item.StartDate() ) - Duration::Days( 30 ), DateTime::MinDateTime() ).Date(); queryEndDate := guard( max( this, Period_MP, item, true, item.EndDate() ), Date::MaxDate() ); - organcodelist := selectvalues( globalOTDTable, BusinessType.OrganCode, organ, businessTypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() ); listtodeal := selectset( globalOTDTable, Global_MappingInventorySupply, externalSupply, -- Gitblit v1.9.3