From 9efbae46f8a30801a7285bb668526fc661be42e7 Mon Sep 17 00:00:00 2001
From: Administrator <renhui.hao@capgemini.com>
Date: 星期日, 08 十月 2023 21:12:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev'
---
_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan#127.qbl | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl" "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
index c1d4c3f..ff774ec 100644
--- "a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
+++ "b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizeDataToMacroPlan\043127.qbl"
@@ -2,7 +2,9 @@
#parent: #root
Method SynchronizeDataToMacroPlan (
MacroPlan macroPlan,
- Boolean isUnitOfMeasure_MP
+ String executionUser,
+ Boolean isUnitOfMeasure_MP,
+ Boolean isCustomOrder
)
{
TextBody:
@@ -10,5 +12,9 @@
if ( isUnitOfMeasure_MP ) {
Global_MappingUnitOfMeasure_MP::SynchronizeMacroPlanData( this, macroPlan );
}
+
+ if ( isCustomOrder ) {
+ Global_MappingCustomOrder::SynchronizeMacroPlanData( this, macroPlan, executionUser );
+ }
*]
}
--
Gitblit v1.9.3