From b854a10fcefa4df101f1e83271741626bf8086cf Mon Sep 17 00:00:00 2001 From: lazhen <17772815105@139.com> Date: 星期四, 28 十一月 2024 20:07:25 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg --- _Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl index 604f0e4..663fa44 100644 --- a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl +++ b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl @@ -3,7 +3,9 @@ StaticMethod PushPlanInventoryData ( const MacroPlan macroPlan, InterfaceDataset interfaceDataset, - String executor + String executor, + Boolean isinventoryplandl, + Boolean isinventoryplancc ) { Description: '鍙戦�佽鍒掑簱瀛樻暟鎹帴鍙�' @@ -16,7 +18,7 @@ jsonarray := JSON::Array(); - traverse ( table, Row, r ){ + traverse ( table, Row, r, ifexpr( isinventoryplandl, r.Unit().Regex( "DL" ), false ) or ifexpr( isinventoryplancc, r.Unit().Regex( "CC" ), false ) ){ traverse ( table, Column, c ) {//, c.TimeUnit() = Translations::MP_GlobalParameters_Day() cell := select( r, Cell, tempC, tempC.Column() = c ); -- Gitblit v1.9.3