From 30010fad767e42c851d8961cdea97a4444a756ae Mon Sep 17 00:00:00 2001
From: yypsybs <yypsybs@foxmail.com>
Date: 星期三, 20 九月 2023 14:58:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl b/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
index 6d55643..0c19698 100644
--- a/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
+++ b/_Main/BL/Type_Lane/StaticMethod_CreateLaneFromJson.qbl
@@ -1,7 +1,8 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateLaneFromJson (
- JSON datarow
+ JSON datarow,
+ MacroPlan macroplan
) as Lane
{
Description: 'Read the json data and use it to create lane data'
@@ -14,6 +15,11 @@
userleadtime := datarow.Get( "userleadtime" );
processingtime := Duration::Zero();
+ unitofmeasurename := "PCS";
+ currencyid := "CNY";
+ startdate := Date::Date( 1900, 1, 1 );
+ enddate := Date::Date( 9999, 12, 31 );
+ capacitytype := "Transport quantity";
if( userleadtime.IsNull() )
{
processingtime := Duration::Zero();
@@ -24,6 +30,16 @@
};
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 );
+ }
result := Lane::CreateLane( unit, id, name, processingtime);
--
Gitblit v1.9.3