From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin
---
_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl b/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
index 0c19698..d4e9b77 100644
--- a/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
+++ b/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
@@ -16,7 +16,6 @@
processingtime := Duration::Zero();
unitofmeasurename := "PCS";
- currencyid := "CNY";
startdate := Date::Date( 1900, 1, 1 );
enddate := Date::Date( 9999, 12, 31 );
capacitytype := "Transport quantity";
@@ -31,17 +30,17 @@
unit := Unit::FindUnitTypeIndex( unitid );
if( isnull( unit)){
- unit :=macroplan.Unit( relnew,
- ID := unitid,
- Name := unitid,
- UnitOfMeasureName := unitofmeasurename,
- CurrencyID := currencyid,
- StartDate := startdate,
- EndDate := enddate,
- CapacityType := capacitytype );
+ unit := macroplan.Unit( relnew, ID := unitid,
+ Name := unitid,
+ ParentUnitID := "杩愯緭",
+ CapacityType := capacitytype,
+ UnitOfMeasureName := unitofmeasurename,
+ CurrencyID := macroplan.BaseCurrency().ID(),
+ StartDate := startdate,
+ EndDate := enddate );
}
- result := Lane::CreateLane( unit, id, name, processingtime);
+ result := Lane::CreateLane( macroplan, unit, id, name, processingtime);
return result;
*]
--
Gitblit v1.9.3