From 5e05845f9b55eeb8f8b1bcb735c958ebfb6b65a8 Mon Sep 17 00:00:00 2001
From: hongji.li <hongji.a.li@capgemini.com>
Date: 星期日, 08 十月 2023 21:05:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj
---
_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl b/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
index a0137d5..f44304e 100644
--- a/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
+++ b/_Main/BL/Type_MacroPlan/Method_MappingOperationCostData.qbl
@@ -10,24 +10,22 @@
[*
// Administrator Aug-21-2023 (created)
// list to deal
- listtodeal := construct( structured[MappingOperation] );
+ listtodeal := construct( structured[Global_MappingOperation] );
if( isnull( businesstypes ) or businesstypes.Size() = 0 ) {
- listtodeal := selectset( this, MappingOperation, item, true );
+ listtodeal := selectset( globalOTDTable, Global_MappingOperation, item, true );
} else {
organcodelist := selectvalues( globalOTDTable, BusinessType.OrganCode, organ, businesstypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() );
- listtodeal := selectset( this,
- MappingOperation,
+ listtodeal := selectset( globalOTDTable, Global_MappingOperation,
item,
( businesstypes.Find( item.BusinessType() ) <> -1 ) and
( organcodelist.Find( item.OrganCode() ) >= 0 ) );
}
// Get the list to deal with max sequence number
- listtodealwithmaxsn := construct( structured[MappingOperation] );
+ listtodealwithmaxsn := construct( structured[Global_MappingOperation] );
traverse( listtodeal, Elements, item ){
- maxsn := maxselect( this,
- MappingOperation,
+ maxsn := maxselect( globalOTDTable, Global_MappingOperation,
moperation,
moperation.OrganCode() = item.OrganCode(),
moperation.ProductID() = item.ProductID(),
@@ -56,8 +54,8 @@
isfromdb := false;
existoperationcost := OperationCost::FindOperationCostTypeIndex( id );
if( isnull( existoperationcost ) ){
- connecteditem := select( this,
- MappingOperationCost,
+ connecteditem := select( globalOTDTable,
+ Global_MappingOperationCost,
moperationcost,
moperationcost.OrgCode() = item.OrganCode(),
moperationcost.ProductID() = item.ProductID() );
--
Gitblit v1.9.3