From 0090b5a24367caf194100ed356273bb5ee304017 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期一, 26 八月 2024 17:50:33 +0800
Subject: [PATCH] 修改加班时间

---
 _Main/BL/Type_LocalCell_Default/Method_SetBreakDayOverTimeDurction.qbl       |   28 ++++++++-----
 _Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl |    2 
 _Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl              |    2 
 _Main/BL/Type_LocalCell_Default/Method_SetOvertimeDurction.qbl               |   30 +++++++++------
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/_Main/BL/Type_LocalCell_Default/Method_SetBreakDayOverTimeDurction.qbl b/_Main/BL/Type_LocalCell_Default/Method_SetBreakDayOverTimeDurction.qbl
index 4273106..8a81702 100644
--- a/_Main/BL/Type_LocalCell_Default/Method_SetBreakDayOverTimeDurction.qbl
+++ b/_Main/BL/Type_LocalCell_Default/Method_SetBreakDayOverTimeDurction.qbl
@@ -9,21 +9,27 @@
     // rislai Jul-10-2024 (created)
     overtime := 0.0;
     nextDayOvertime := 0.0;
-    if( outcome = "涓�鐝�" ){
-      overtime := 8.5;
+    if( outcome = "1" ){
+      overtime := 8;
       nextDayOvertime := 0.0;
-    }else if( outcome = "浜岀彮" ){
-      overtime := 16;
-      nextDayOvertime := 0.5;
+    }else if( outcome = "2" ){
+      overtime := 15;
+      nextDayOvertime := 1;
     }else if(outcome = "9+9"){
       overtime := 16;
-      nextDayOvertime := 2.5;
+      nextDayOvertime := 2;
     }else if(outcome = "10+10"){
-      overtime := 16;
-      nextDayOvertime := 4.5;
-    }else if(outcome = "涓夌彮"){
-      overtime := 16;
-      nextDayOvertime := 8;
+      overtime := 17;
+      nextDayOvertime := 3;
+    }else if(outcome = "1(9)" or outcome = "1锛�9锛�"){
+      overtime := 9;
+      nextDayOvertime := 0;
+    }else if(outcome = "1(10)" or outcome = "1锛�10锛�"){
+      overtime := 10;
+      nextDayOvertime := 0;
+    }else if(outcome = "3"){
+      overtime := 15;
+      nextDayOvertime := 7.5;
     }
     this.RealValue( this.RealValue() + overtime + nextDayOvertime );
   *]
diff --git a/_Main/BL/Type_LocalCell_Default/Method_SetOvertimeDurction.qbl b/_Main/BL/Type_LocalCell_Default/Method_SetOvertimeDurction.qbl
index a5fb5ae..e5a7d36 100644
--- a/_Main/BL/Type_LocalCell_Default/Method_SetOvertimeDurction.qbl
+++ b/_Main/BL/Type_LocalCell_Default/Method_SetOvertimeDurction.qbl
@@ -9,21 +9,27 @@
     // rislai Jul-10-2024 (created)
     overtime := 0.0;
     nextDayOvertime := 0.0;
-    if( outcome = "涓�鐝�" ){
-      overtime := 0.5;
+    if( outcome = "1" ){
+      overtime := 0;
       nextDayOvertime := 0.0;
-    }else if( outcome = "浜岀彮" ){
-      overtime := 8;
-      nextDayOvertime := 0.5;
+    }else if( outcome = "2" ){
+      overtime := 0;
+      nextDayOvertime := 0.0;
     }else if(outcome = "9+9"){
-      overtime := 8;
-      nextDayOvertime := 2.5;
+      overtime := 1;
+      nextDayOvertime := 1;
     }else if(outcome = "10+10"){
-      overtime := 8;
-      nextDayOvertime := 4.5;
-    }else if(outcome = "涓夌彮"){
-      overtime := 8;
-      nextDayOvertime := 8;
+      overtime := 2;
+      nextDayOvertime := 2;
+    }else if(outcome = "1(9)" or outcome = "1锛�9锛�"){
+      overtime := 1;
+      nextDayOvertime := 0;
+    }else if(outcome = "1(10)" or outcome = "1锛�10锛�"){
+      overtime := 2;
+      nextDayOvertime := 0;
+    }else if(outcome = "3"){
+      overtime := 0;
+      nextDayOvertime := 0;
     }
     this.RealValue( this.RealValue() + overtime + nextDayOvertime );
   *]
diff --git a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
index bf0aaa9..738d95b 100644
--- a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
+++ b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
@@ -9,7 +9,7 @@
   Description: '鏍囧噯宸ユ椂鍒舵姤琛�'
   TextBody:
   [*
-    // rislai Jul-4-2024 (created)
+     // rislai Jul-4-2024 (created)
     table := owner.LocalTable( relnew,Name := "鏍囧噯宸ユ椂鍒舵姤琛�");
     
     //column1  := table.LocalColumn( relnew,Name := "宸ュ巶" ,CustomIndex := 1);
diff --git a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
index bead82a..cc699fc 100644
--- a/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
+++ b/_Main/BL/Type_LocalCell_ScheduleSummary/StaticMethod_Create.qbl
@@ -29,7 +29,7 @@
     traverse( owner,Unit,unit,unit.HasCapacityTypeTime() and not unit.HasChild()){
       // unit.AsEntity().DisplayNameForSelection()
       row := table.MP_Row( relnew,CustomName := unit.ID(),Index := table.GetRowIndexCache() ); 
-      throughput := sum( unit,Operation,operation,operation.Throughput() ) / unit.Operation( relsize );
+      throughput := guard( sum( unit,Operation,operation,operation.Throughput() ) / unit.Operation( relsize ) , 0 );
       
       unitPeriodTimes := selectset( unit,UnitPeriod.astype( UnitPeriodTime ),unitPeriodTime,
                                         unitPeriodTime.Period_MP().StartDate() >= startDate 

--
Gitblit v1.9.3