From 472c228ef6d7c8d877558ff90051b1fdb35ffb5c Mon Sep 17 00:00:00 2001
From: renhao <renhui.hao@capgemini.com>
Date: 星期二, 10 十月 2023 14:05:34 +0800
Subject: [PATCH] Merge branch 'dev'
---
_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_DateSelectorOrderLockHeaderCustomerOrder_O.def | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_DateSelectorOrderLockHeaderCustomerOrder_O.def b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_DateSelectorOrderLockHeaderCustomerOrder_O.def
index 5fa0f71..bef1aa1 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_DateSelectorOrderLockHeaderCustomerOrder_O.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormOrderLock/Response_PanelOrderLockHeader_545_DateSelectorOrderLockHeaderCustomerOrder_O.def
@@ -19,11 +19,11 @@
newfilter := "";
findcount := 0;
traverse( existfilterlist, Elements, filter ){
- if( filter.FindString( "EndDate()", 0 ) >= 0 ){
+ if( filter.FindString( "StartDate()", 0 ) >= 0 ){
if( newfilter = "" ){
- newfilter := "( object.EndDate() = " + this.Date().AsQUILL() + " )";
+ newfilter := "( object.StartDate() = " + this.Date().AsQUILL() + " )";
}else{
- newfilter := newfilter + " and " + "( object.EndDate() = " + this.Date().AsQUILL() + " )";
+ newfilter := newfilter + " and " + "( object.StartDate() = " + this.Date().AsQUILL() + " )";
}
findcount := 1;
}else{
@@ -37,9 +37,9 @@
if( findcount = 0 ){
if( newfilter = "" ){
- newfilter := "( object.EndDate() = " + this.Date().AsQUILL() + " )";
+ newfilter := "( object.StartDate() = " + this.Date().AsQUILL() + " )";
}else{
- newfilter := newfilter + " and " + "( object.EndDate() = " + this.Date().AsQUILL() + " )";
+ newfilter := newfilter + " and " + "( object.StartDate() = " + this.Date().AsQUILL() + " )";
}
}
--
Gitblit v1.9.3