From c3b3f7d30a3834e5e37cc51e7806bc9f2a81fce0 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期五, 18 十月 2024 17:41:40 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
index 2612599..d6344e0 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_CreateFullTable.qbl
@@ -51,7 +51,6 @@
}
- //shiftPatternCount := NamedValueTree::Create();
traverse( tables,Elements.MP_Row,row ){
rowMacroPlan := row.MP_Table().MacroPlan();
localRow := null( LocalRow );
@@ -101,25 +100,14 @@
}
}
- maxShiftPattern := "";
- maxShiftPatternCount := 0;
-
workingDay := 0;
capacity := 0.0;
-
+ shiftPatterns := construct( Strings );
traverse( cells,Elements,cell ){
workingDay := workingDay + cell.WorkingDay();
capacity := capacity + cell.Capacity();
-
- if( maxShiftPattern <> cell.ShiftPattern() ){
- if( maxShiftPatternCount = 0 ){
- maxShiftPattern := cell.ShiftPattern();
- maxShiftPatternCount ++;
- }else{
- maxShiftPatternCount --;
- }
- }else{
- maxShiftPatternCount ++;
+ if( cell.ShiftPattern() <> "" ){
+ shiftPatterns.Add( cell.ShiftPattern() );
}
}
localCell := null( LocalCell_ScheduleSummary );
@@ -135,9 +123,7 @@
}
}
- if( not maxShiftPattern = "" ){
- localCell.ShiftPattern( maxShiftPattern );
- }
+ localCell.ShiftPattern( selectuniquevalues( shiftPatterns,Elements,element,element ).Concatenate( "/" ) );
localCell.WorkingDay( localCell.WorkingDay() + workingDay );
localCell.Capacity( localCell.Capacity() + capacity );
localCell.Output( localCell.Output() + output );
--
Gitblit v1.9.3