From 86d2018efcbee0e9a6d0c33ae93f4fc423242973 Mon Sep 17 00:00:00 2001 From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com> Date: 星期五, 29 十一月 2024 14:35:02 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl index 72ccf58..7673189 100644 --- a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl +++ b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl @@ -3,7 +3,9 @@ StaticMethod PushOfflinePlanData ( const MacroPlan macroPlan, InterfaceDataset interfaceDataset, - String executor + String executor, + Boolean isofflineplandl, + Boolean isofflineplancc ) { Description: '鍙戦�佷笅绾胯鍒掓暟鎹帴鍙�' @@ -16,7 +18,7 @@ jsonarray := JSON::Array(); - traverse ( table, Row, r ){ + traverse ( table, Row, r, ifexpr( isofflineplandl, r.Unit().Regex( "DL" ), false ) or ifexpr( isofflineplancc, 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