From acffa3d576342b2d24001d8410d53e6972eeb9e5 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 16 十月 2024 19:16:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
index 7332ee9..6fbaedf 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
@@ -35,7 +35,7 @@
unit := selectobject( macroplan, Unit, unit, unit.ID() = excel.Unit() );
feedback := '';
if( ChangeLossSetting::ValidateInput( feedback, macroplan, null( ChangeLossSetting ), unit, product1, product2, excel.StartDate(), excel.EndDate(), excel.ChangeLossNumber() ) ){
- cls := macroplan.ChangeLossSetting( relnew, ChangeLossNumber := [Real]excel.ChangeLossNumber() );
+ cls := macroplan.ChangeLossSetting( relnew, ChangeLossNumber := [Real]excel.ChangeLossNumber(), StartDate := excel.StartDate(), EndDate := excel.EndDate() );
cls.ProductFirst( relset, product1 );
cls.ProductSecond( relset, product2 );
@@ -48,6 +48,8 @@
error( feedback );
}
}else {
+ cls.StartDate( excel.StartDate() );
+ cls.EndDate( excel.EndDate() );
cls.ChangeLossNumber( [Real]excel.ChangeLossNumber() );
}
info( '-------------------', cls.ChangeLossNumber() );
--
Gitblit v1.9.3