From e8be76a40ae0b3cb1d37a6e91e25c1284a50347f Mon Sep 17 00:00:00 2001 From: Administrator <renhui.hao@capgemini.com> Date: 星期四, 21 九月 2023 20:59:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev' --- _Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def index fc51ac5..92f2bb9 100644 --- a/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def +++ b/_Main/UI/MacroPlannerWebApp/Component_FormFillingScheme/Response_ListFillingScheme_MenuDelete_OnClick.def @@ -10,9 +10,12 @@ Initiator: 'MenuDelete' Precondition: [* + //feedback := Translations::FilllingCapacity_NotRelease(); + //checkValue := not FilllingCapacityOrderScheme::HasAlreadyRelease( MacroPlan); + //return checkValue; feedback := Translations::FilllingCapacity_NotRelease(); - checkValue := FilllingCapacityOrderScheme::HasAlreadyRelease( MacroPlan); - return checkValue; + checkValue := selectobject( MacroPlan,FilllingCapacityOrderScheme,scheme,scheme.IsRelease()) + return isnull( checkValue ); *] QuillAction { -- Gitblit v1.9.3