From 85fb8fdf8bdef29cbe8a1f64bc27e049454e7142 Mon Sep 17 00:00:00 2001
From: yunchai <yunying.chai@capgemini.com>
Date: 星期一, 25 九月 2023 22:15:28 +0800
Subject: [PATCH] 合并DEV并且更新了冲减到订单
---
_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
index fa613b6..7c856ff 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl
@@ -15,20 +15,22 @@
listtodeal := selectset( this, MappingOperation, item, true );
} else {
listtodeal := selectset( this, MappingOperation, item,
- businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
- );
+ // businesstypes.Difference( businesstypes.Difference( item.BusinessType().Tokenize( ", " ) ) ).Size() > 0
+ businesstypes.Find( item.BusinessType() ) >= 0
+ );
}
//Set the Default values
unitofmeasurename := "PCS";
- capacitytype := "Infinite";
+ infinite := "Infinite";
+ capacitytype := "Transport quantity";
// Get the root data
Unit::CreateOrUpdate( this,
"澶╅┈闆嗗洟",
"澶╅┈闆嗗洟",
"",
- capacitytype,
+ infinite,
unitofmeasurename );
// Get the sub root data
@@ -36,14 +38,14 @@
"鐢熶骇",
"鐢熶骇",
"澶╅┈闆嗗洟",
- capacitytype,
+ infinite,
unitofmeasurename );
Unit::CreateOrUpdate( this,
"渚涘簲鍟�",
"渚涘簲鍟�",
"澶╅┈闆嗗洟",
- capacitytype,
+ infinite,
unitofmeasurename );
Unit::CreateOrUpdate( this,
@@ -64,7 +66,7 @@
item.OrganCode(),
OrgName,
"鐢熶骇",
- capacitytype,
+ infinite,
unitofmeasurename );
//Get the second level unit
@@ -73,7 +75,7 @@
secondlevelid,
secondlevelid,
item.OrganCode(),
- capacitytype,
+ infinite,
unitofmeasurename );
//Get the third level unit
--
Gitblit v1.9.3