From c145c6e7b6b347031d0f82fccd44423e5fb5f255 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 12 六月 2024 11:23:28 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_ProductionLineBatchData/Method_Enable.qbl | 4 ++--
_Main/BL/Type_ProductionLineBatchData/StaticMethod_Create.qbl | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/_Main/BL/Type_ProductionLineBatchData/Method_Enable.qbl b/_Main/BL/Type_ProductionLineBatchData/Method_Enable.qbl
index 3dd7f3e..8347391 100644
--- a/_Main/BL/Type_ProductionLineBatchData/Method_Enable.qbl
+++ b/_Main/BL/Type_ProductionLineBatchData/Method_Enable.qbl
@@ -12,8 +12,8 @@
shiftPattern2 := this.ShiftPattern2();
tempShiftPattern := shiftPattern1;
- dayPeriod_MPs := selectsortedset( owner,Period_MP,period_MP, period_MP.TimeUnit() = 'Day' and period_MP.StartDate() >= this.StartDate() and period_MP.EndDate() < this.EndDate() ,period_MP.StartDate());
- weekPeriod_MPs := selectsortedset( owner,Period_MP,period_MP, period_MP.TimeUnit() = 'Week' and period_MP.StartDate() >= this.StartDate() and period_MP.EndDate() < this.EndDate() ,period_MP.StartDate());
+ dayPeriod_MPs := selectsortedset( owner,Period_MP,period_MP, period_MP.TimeUnit() = 'Day' and period_MP.StartDate() >= this.StartDate() and period_MP.EndDate() <= this.EndDate() ,period_MP.StartDate());
+ weekPeriod_MPs := selectsortedset( owner,Period_MP,period_MP, period_MP.TimeUnit() = 'Week' and period_MP.StartDate() >= this.StartDate() and period_MP.EndDate() <= this.EndDate() ,period_MP.StartDate());
// period_MPs := selectsortedset( owner,Period_MP,period_MP, period_MP.StartDate() >= this.StartDate() and period_MP.EndDate() <= this.EndDate() ,period_MP.StartDate());
if( dayPeriod_MPs.Size() > 0 ){
diff --git a/_Main/BL/Type_ProductionLineBatchData/StaticMethod_Create.qbl b/_Main/BL/Type_ProductionLineBatchData/StaticMethod_Create.qbl
index fc86ab1..7654032 100644
--- a/_Main/BL/Type_ProductionLineBatchData/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_ProductionLineBatchData/StaticMethod_Create.qbl
@@ -8,7 +8,7 @@
ShiftPattern shiftPattern2,
Date startDate,
Date endDate
-)
+) as ProductionLineBatchData
{
TextBody:
[*
@@ -36,5 +36,7 @@
Unit2 := line2,
StartDate := startDate,
EndDate := endDate );
+
+ return data;
*]
}
--
Gitblit v1.9.3