From ed09bf3eb41fcf1b79b083ac3d959f110b7e613b Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期一, 14 十月 2024 18:28:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_SplitShifts.qbl | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_SplitShifts.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_SplitShifts.qbl
index 1de3a99..cd068af 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_SplitShifts.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_SplitShifts.qbl
@@ -12,19 +12,32 @@
shiftSchedulingInformations := construct( DispatchShiftSchedulingInformations );
if( shiftName = "3" ){
shiftSchedulingInformation1 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 3 );
- shiftSchedulingInformation1.SingleShiftName( "1鐝�" );
+ shiftSchedulingInformation1.SingleShiftName( "鐧界彮" );
shiftSchedulingInformations.Add( shiftSchedulingInformation1 );
shiftSchedulingInformation2 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 3 );
- shiftSchedulingInformation2.SingleShiftName( "2鐝�" );
+ shiftSchedulingInformation2.SingleShiftName( "浜岀彮" );
shiftSchedulingInformations.Add( shiftSchedulingInformation2 );
shiftSchedulingInformation3 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 3 );
- shiftSchedulingInformation3.SingleShiftName( "3鐝�" );
+ shiftSchedulingInformation3.SingleShiftName( "涓夌彮" );
shiftSchedulingInformations.Add( shiftSchedulingInformation3 );
+ }else if( shiftName = "2" ){
+ shiftSchedulingInformation1 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 2 );
+ shiftSchedulingInformation1.SingleShiftName( "鐧界彮" );
+ shiftSchedulingInformations.Add( shiftSchedulingInformation1 );
+
+ shiftSchedulingInformation2 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 2 );
+ shiftSchedulingInformation2.SingleShiftName( "浜岀彮" );
+ shiftSchedulingInformations.Add( shiftSchedulingInformation2 );
+ }else if( shiftName = "1" ){
+ shiftSchedulingInformation1 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 1 );
+ shiftSchedulingInformation1.SingleShiftName( "鐧界彮" );
+ shiftSchedulingInformations.Add( shiftSchedulingInformation1 );
}else{
- shiftSchedulingInformation := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume );
- shiftSchedulingInformations.Add( shiftSchedulingInformation );
+ shiftSchedulingInformation1 := owner.DispatchShiftSchedulingInformation( relnew ,ID := IDHolder::GetGUID(),ShiftName := shiftName,ShiftVolume := shiftVolume / 1 );
+ shiftSchedulingInformation1.SingleShiftName( "" );
+ shiftSchedulingInformations.Add( shiftSchedulingInformation1 );
}
--
Gitblit v1.9.3