From 4a3d9ec9b4d11f096fc24cfeee40246492dc08fd Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期一, 25 九月 2023 22:43:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl b/_Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl
index df72958..5806f00 100644
--- a/_Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl
+++ b/_Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl
@@ -7,7 +7,7 @@
String parentunitid,
String capacitytype,
String unitofmeasurename
-)
+) as Unit
{
TextBody:
[*
@@ -21,7 +21,7 @@
unit := Unit::FindById( owner, id );
if( id="澶╅┈闆嗗洟" and isnull( unit ) ){
- owner.Unit( relnew,
+ unit := owner.Unit( relnew,
ID := id,
Name := name,
UnitOfMeasureName := unitofmeasurename,
@@ -31,7 +31,7 @@
CapacityType := capacitytype );
}else{
if( isnull( unit ) ){
- owner.Unit( relnew, ID := id,
+ unit := owner.Unit( relnew, ID := id,
Name := name,
ParentUnitID := parentunitid,
CapacityType := capacitytype,
@@ -46,5 +46,7 @@
unit.UnitOfMeasureName( unitofmeasurename );
}
}
+
+ return unit;
*]
}
--
Gitblit v1.9.3