From 1499d8149575493519f2c5b04462c2302a455aa9 Mon Sep 17 00:00:00 2001
From: haorenhui <renhui.hao@capgemini.com>
Date: 星期五, 27 十月 2023 15:16:24 +0800
Subject: [PATCH] Merge branch 'dev' into dev_hrh_global
---
_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
index b6057a9..c4faffb 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_ButtonOrderLockHeaderFresh_OnClick.def
@@ -11,8 +11,10 @@
Body:
[*
macroplan := MacroPlan;
+ global := GlobalOTDTable;
businesstypes := DataHolderOrderLockGlobal.Data().BusinessType().Tokenize( ',' );
- CustomerOrder::DoSync( macroplan, businesstypes );
+ organcodelist := selectvalues( global, BusinessType.OrganCode, organ, businesstypes.Find( organ.BusinessType().BusinessTypeName() ) <> -1, organ.OrganCodeName() );
+ CustomerOrder::DoSync( macroplan, businesstypes, global, organcodelist );
*]
}
}
--
Gitblit v1.9.3