From e9ff2a760a9fc520ae3002b6a13b0b3e4c3813b5 Mon Sep 17 00:00:00 2001
From: admin <admin@admin.com>
Date: 星期日, 22 九月 2024 15:44:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl b/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
index 065a5cc..6980d92 100644
--- a/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
+++ b/_Main/BL/Type_ChangeLossSetting/StaticMethod_ValidateInput.qbl
@@ -31,7 +31,9 @@
or ( cls.ProductFirst() = product2 and cls.ProductSecond() = product1 ) ) ) ){
feedback := Translations::MP_ChangeLossSetting_Exist()
}
- if( feedback = '' and exists( owner, ChangeLossSetting, cls, cls <> old and not ( cls.StartDate() > enddate or cls.EndDate() < startdate ) ) ){
+ 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 ) ) ) ){
feedback := Translations::MP_ChangeLossSetting_DateCoincide()
}
--
Gitblit v1.9.3