From 03f93088637930acbda3cd0b405114e0b00c13e4 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 30 九月 2024 17:29:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
index 2e8db80..7332ee9 100644
--- a/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
+++ b/_Main/BL/Type_ChangeLossSettingExcel/StaticMethod_Import.qbl
@@ -28,13 +28,14 @@
and cls.Unit().ID() = excel.Unit()
and cls.StartDate() = excel.StartDate()
and cls.EndDate() = excel.EndDate() );
+ info( excel.ChangeLossNumber() );
if( isnull( cls ) ){
product1 := selectobject( macroplan, Product_MP, product, product.ID() = excel.Product1() );
product2 := selectobject( macroplan, Product_MP, product, product.ID() = excel.Product2() );
unit := selectobject( macroplan, Unit, unit, unit.ID() = excel.Unit() );
feedback := '';
- if( ChangeLossSetting::ValidateInput( feedback, macroplan, null( ChangeLossSetting ), unit, product1, product2, excel.StartDate(), excel.EndDate(), [Number]excel.ChangeLossNumber() ) ){
- cls := macroplan.ChangeLossSetting( relnew, ChangeLossNr := [Number]excel.ChangeLossNumber() );
+ 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.ProductFirst( relset, product1 );
cls.ProductSecond( relset, product2 );
@@ -47,8 +48,9 @@
error( feedback );
}
}else {
- cls.ChangeLossNr( [Number]excel.ChangeLossNumber() );
+ cls.ChangeLossNumber( [Real]excel.ChangeLossNumber() );
}
+ info( '-------------------', cls.ChangeLossNumber() );
excel.Delete();
}
*]
--
Gitblit v1.9.3