From 34d29be6a3eb0c025da50b77f2107c4ad259c6c0 Mon Sep 17 00:00:00 2001 From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com> Date: 星期一, 25 九月 2023 22:50:04 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into feature/kevin_addsanitycheck --- _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