From 0830e90cb8a9a9737a99f98632288d3e92a6895c Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 25 十月 2024 17:27:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_WholeShift/Method_ContinuousProductionScheduling.qbl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/_Main/BL/Type_WholeShift/Method_ContinuousProductionScheduling.qbl b/_Main/BL/Type_WholeShift/Method_ContinuousProductionScheduling.qbl
index a430caf..f24752a 100644
--- a/_Main/BL/Type_WholeShift/Method_ContinuousProductionScheduling.qbl
+++ b/_Main/BL/Type_WholeShift/Method_ContinuousProductionScheduling.qbl
@@ -17,8 +17,8 @@
while ( needHandleUPTBs.Size() > 0 ) {
- debuginfo( "-------------------------------------------", "姝ｅ湪澶勭悊鐨勫懆寮�濮嬫椂闂达細", indexStartDate.Format( "Y-M2-D2" ),
- " 姝ｅ湪澶勭悊鐨勫懆缁撴潫鏃堕棿锛�", ( indexStartDate.StartOfNextWeek() - 1 ).Format( "Y-M2-D2" ), " 澶勭悊鐨勪釜鏁帮細", needHandleUPTBs.Size() );
+ // debuginfo( "-------------------------------------------", "姝ｅ湪澶勭悊鐨勫懆寮�濮嬫椂闂达細", indexStartDate.Format( "Y-M2-D2" ),
+ // " 姝ｅ湪澶勭悊鐨勫懆缁撴潫鏃堕棿锛�", ( indexStartDate.StartOfNextWeek() - 1 ).Format( "Y-M2-D2" ), " 澶勭悊鐨勪釜鏁帮細", needHandleUPTBs.Size() );
// 闇�瑕佸鐞嗘爣蹇�
needHandleFlag := false;
@@ -28,7 +28,7 @@
firstAppearCapacityDate1 := Date::MinDate();
// 璇嗗埆鏄惁闇�瑕佽繛缁帓浜�
- traverse ( needHandleUPTBs, Elements, uptb ) {
+ traverse ( needHandleUPTBs, Elements, uptb, not needHandleFlag ) {
// 缁欑涓�娆′骇鑳借祴鍊�
if ( firstAppearCapacityDate.IsMinInfinity() and uptb.UsedCapacity().HoursAsReal() > 0.0 ) {
firstAppearCapacityDate := uptb.StartDate();
@@ -48,7 +48,7 @@
// 澶勭悊杩炵画鎺掍骇
if ( needHandleFlag ) {
// 绱㈠紩寮�濮嬫椂闂�
- handleIndexStartDate := firstAppearCapacityDate1 + 1;
+ handleIndexStartDate := firstAppearCapacityDate + 1;
// 闇�瑕佸鐞嗙殑UPTB鐨勬渶澶ф椂闂�
handleIndexEndDate := maxobject( needHandleUPTBs, Elements, tempUPTB, true, tempUPTB.StartDate() ).StartDate();
--
Gitblit v1.9.3