From 7a687fce2b000f2c3414d757b78849921dcfade5 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 10 十月 2024 17:55:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl b/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
index ebd5300..892d832 100644
--- a/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
+++ b/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
@@ -29,13 +29,15 @@
feedback := Translations::MP_LibCal_Event_ValidDatePeriod();
}
if( exists( owner, ChangeLossSetting, cls, cls <> old and cls.Unit() = unit and not ( cls.StartDate() > enddate or cls.EndDate() < startdate )
- and ( ( cls.ProductFirst() = product1 and cls.ProductSecond() = product2 )
- or ( cls.ProductFirst() = product2 and cls.ProductSecond() = product1 ) ) ) ){
+ and cls.ProductFirst() = product1 and cls.ProductSecond() = product2 ) ){
+ // and ( ( cls.ProductFirst() = product1 and cls.ProductSecond() = product2 )
+ // or ( cls.ProductFirst() = product2 and cls.ProductSecond() = product1 ) ) ) ){
feedback := Translations::MP_ChangeLossSetting_Exist()
}
if( exists( owner, ChangeLossSetting, cls, cls <> old and cls.Unit() = unit and not ( cls.StartDate() > enddate or cls.EndDate() < startdate )
- and ( ( cls.ProductFirst() = product1 and cls.ProductSecond() = product2 )
- or ( cls.ProductFirst() = product2 and cls.ProductSecond() = product1 ) ) ) ){
+ and cls.ProductFirst() = product1 and cls.ProductSecond() = product2 ) ){
+ // and ( ( cls.ProductFirst() = product1 and cls.ProductSecond() = product2 )
+ // or ( cls.ProductFirst() = product2 and cls.ProductSecond() = product1 ) ) ) ){
feedback := Translations::MP_ChangeLossSetting_DateCoincide()
}
--
Gitblit v1.9.3