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_MacroPlan/Method_MappingUnitData.qbl | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
index b5618c6..7c856ff 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
@@ -22,6 +22,7 @@
//Set the Default values
unitofmeasurename := "PCS";
+ infinite := "Infinite";
capacitytype := "Transport quantity";
// Get the root data
@@ -29,7 +30,7 @@
"澶╅┈闆嗗洟",
"澶╅┈闆嗗洟",
"",
- capacitytype,
+ infinite,
unitofmeasurename );
// Get the sub root data
@@ -37,14 +38,14 @@
"鐢熶骇",
"鐢熶骇",
"澶╅┈闆嗗洟",
- capacitytype,
+ infinite,
unitofmeasurename );
Unit::CreateOrUpdate( this,
"渚涘簲鍟�",
"渚涘簲鍟�",
"澶╅┈闆嗗洟",
- capacitytype,
+ infinite,
unitofmeasurename );
Unit::CreateOrUpdate( this,
@@ -65,7 +66,7 @@
item.OrganCode(),
OrgName,
"鐢熶骇",
- capacitytype,
+ infinite,
unitofmeasurename );
//Get the second level unit
@@ -74,7 +75,7 @@
secondlevelid,
secondlevelid,
item.OrganCode(),
- capacitytype,
+ infinite,
unitofmeasurename );
//Get the third level unit
--
Gitblit v1.9.3