From d08437dffec5f85b5efc881369f3a042f346b7d6 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期六, 12 十月 2024 17:48:14 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl | 19 ++++++---
_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl | 8 ++-
_Main/Sys/Repr/Global/LocalCell_Default.qrp | 18 +++++++++
_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateComprehensiveHoursReport#1.qbl | 17 +++++---
_Main/BL/Type_ShiftPlan/Function_CalcColor.qbl | 3 +
5 files changed, 50 insertions(+), 15 deletions(-)
diff --git "a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateComprehensiveHoursReport\0431.qbl" "b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateComprehensiveHoursReport\0431.qbl"
index e51d067..905b371 100644
--- "a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateComprehensiveHoursReport\0431.qbl"
+++ "b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateComprehensiveHoursReport\0431.qbl"
@@ -147,21 +147,26 @@
}
// 骞虫椂鍔犵彮鍊嶇巼
- defaultMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "骞虫椂鍔犵彮鍊嶇巼" );
+ defaultMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "骞虫椂鍔犵彮" );
if( isnull( defaultMultiplier )){
- defaultMultiplier := macroPlan.OvertimeMultiplier( relnew,Name := "骞虫椂鍔犵彮鍊嶇巼",Multiplier := 1 );
+ defaultMultiplier := macroPlan.OvertimeMultiplier( relnew,Name := "骞虫椂鍔犵彮鍊嶇巼",Multiplier := 1.5 );
}
// 浼戞伅鏃ュ姞鐝�嶇巼
- breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "浼戞伅鏃ュ姞鐝�嶇巼");
+ breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "鍛ㄦ湯鍔犵彮");
if( isnull( breakDayMultiplier )){
- breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "浼戞伅鏃ュ姞鐝�嶇巼",Multiplier := 2 );
+ breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "鍛ㄦ湯鍔犵彮",Multiplier := 2 );
+ }
+ // 浼戞伅鏃ュ姞鐝�嶇巼
+ breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "璋冧紤鍔犵彮");
+ if( isnull( breakDayMultiplier )){
+ breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "璋冧紤鍔犵彮",Multiplier := 2 );
}
// 鑺傚亣鏃ュ姞鐝�嶇巼
- holidayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "鑺傚亣鏃ュ姞鐝�嶇巼");
+ holidayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "娉曞畾鑺傚亣鏃ュ姞鐝�");
if( isnull( holidayMultiplier )){
- holidayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "鑺傚亣鏃ュ姞鐝�嶇巼",Multiplier := 3 );
+ holidayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "娉曞畾鑺傚亣鏃ュ姞鐝�",Multiplier := 3 );
}
traverse( table,LocalRow,row ){
diff --git a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
index 3b61ec5..c46525a 100644
--- a/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
+++ b/_Main/BL/Type_LocalCell_Default/StaticMethod_GenerateStandardHoursReport.qbl
@@ -152,21 +152,26 @@
}
// 骞虫椂鍔犵彮鍊嶇巼
- defaultMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "骞虫椂鍔犵彮鍊嶇巼" );
+ defaultMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "骞虫椂鍔犵彮" );
if( isnull( defaultMultiplier )){
- defaultMultiplier := macroPlan.OvertimeMultiplier( relnew,Name := "骞虫椂鍔犵彮鍊嶇巼",Multiplier := 1 );
+ defaultMultiplier := macroPlan.OvertimeMultiplier( relnew,Name := "骞虫椂鍔犵彮鍊嶇巼",Multiplier := 1.5 );
}
// 浼戞伅鏃ュ姞鐝�嶇巼
- breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "浼戞伅鏃ュ姞鐝�嶇巼");
+ breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "鍛ㄦ湯鍔犵彮");
if( isnull( breakDayMultiplier )){
- breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "浼戞伅鏃ュ姞鐝�嶇巼",Multiplier := 2 );
+ breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "鍛ㄦ湯鍔犵彮",Multiplier := 2 );
+ }
+ // 浼戞伅鏃ュ姞鐝�嶇巼
+ breakDayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "璋冧紤鍔犵彮");
+ if( isnull( breakDayMultiplier )){
+ breakDayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "璋冧紤鍔犵彮",Multiplier := 2 );
}
// 鑺傚亣鏃ュ姞鐝�嶇巼
- holidayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "鑺傚亣鏃ュ姞鐝�嶇巼");
+ holidayMultiplier := select( macroPlan,OvertimeMultiplier,object,object.Name() = "娉曞畾鑺傚亣鏃ュ姞鐝�");
if( isnull( holidayMultiplier )){
- holidayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "鑺傚亣鏃ュ姞鐝�嶇巼",Multiplier := 3 );
+ holidayMultiplier := macroPlan.OvertimeMultiplier( relnew, Name := "娉曞畾鑺傚亣鏃ュ姞鐝�",Multiplier := 3 );
}
traverse( table,LocalRow,row ){
@@ -186,6 +191,8 @@
jiabanfeiCell.RealValue( EmployeeCost::GetSalary( unit,holidayMultiplier,jiabanCell.RealValue()));
qiangongCell := LocalCell_Default::GetCell( rowKey + column7.Name(), cellIndexTree, cells, row, column7 );
+ qiangongCell.RealValue( qiangongCell.RealValue() - 1 );
+
qiangongfeiCell := LocalCell_Default::GetCell( rowKey + column11.Name(), cellIndexTree, cells, row, column11 );
qiangongfeiCell.RealValue( EmployeeCost::GetSalary( unit,defaultMultiplier,qiangongCell.RealValue() ));
diff --git a/_Main/BL/Type_ShiftPlan/Function_CalcColor.qbl b/_Main/BL/Type_ShiftPlan/Function_CalcColor.qbl
index 1204e8d..f8beb1b 100644
--- a/_Main/BL/Type_ShiftPlan/Function_CalcColor.qbl
+++ b/_Main/BL/Type_ShiftPlan/Function_CalcColor.qbl
@@ -14,6 +14,9 @@
if( this.EventType() = "鍛ㄦ棩"){
value := "LightBlue";
}
+ if( this.EventType() = "鍛ㄦ湯"){
+ value := "LightBlue";
+ }
if( this.EventType() = "娉曞畾鑺傚亣鏃�"){
value := "Red";
}
diff --git a/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl b/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
index cc7ee8d..61a15c7 100644
--- a/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
+++ b/_Main/BL/Type_ShiftPlan/Method_CalculateEventType.qbl
@@ -23,14 +23,16 @@
result := "";
flag := true;
traverse( values,Elements,value ,flag){
- if( value = "璋冧紤" and result <> "璋冧紤"){
+ if( value = "璋冧紤" and result <> "娉曞畾鑺傚亣鏃�"){
result := "璋冧紤";
}else if( value = "娉曞畾鑺傚亣鏃�" and result <> "娉曞畾鑺傚亣鏃�"){
result := "娉曞畾鑺傚亣鏃�";
- }else if( value = "鍛ㄥ叚" and result <> "鍛ㄥ叚"){
+ }else if( value = "鍛ㄥ叚" and result <> "娉曞畾鑺傚亣鏃�"){
result := "鍛ㄥ叚";
- }else if( value = "鍛ㄦ棩" and result <> "鍛ㄦ棩"){
+ }else if( value = "鍛ㄦ棩" and result <> "娉曞畾鑺傚亣鏃�"){
result := "鍛ㄦ棩";
+ }else if( value = "鍛ㄦ湯" and result <> "娉曞畾鑺傚亣鏃�"){
+ result := "鍛ㄦ湯";
}
}
diff --git a/_Main/Sys/Repr/Global/LocalCell_Default.qrp b/_Main/Sys/Repr/Global/LocalCell_Default.qrp
new file mode 100644
index 0000000..d0871d7
--- /dev/null
+++ b/_Main/Sys/Repr/Global/LocalCell_Default.qrp
@@ -0,0 +1,18 @@
+Quintiq file version 2.0
+#parent: #root
+TypeRepresentation LocalCell_Default
+{
+ AttributeRepresentation RealValue
+ {
+ AttributeKey: '[412672.1.5620866]'
+ Conditional:
+ [
+ ]
+ DataRepresentation.Default
+ {
+ FormatString: 'N(Dec(1))'
+ InheritFormatting: false
+ }
+ }
+ RelationRepresentation LocalColumn { RelationKey: '[412672.0.1084249679]' Visibility: 'Normal' }
+}
--
Gitblit v1.9.3