From 212864834f7727ba09b5ece6e9b71e69e182d228 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 03 十二月 2024 17:09:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
index 777b22d..b845399 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
@@ -165,24 +165,26 @@
singleShiftVolume2 := 0.0;
singleShiftVolume3 := 0.0;
- singleShiftConfigs := selectset( unit,SingleShiftConfig,config,config.ShiftName() = "3" );
- traverse( singleShiftConfigs,Elements,singleShiftConfig ){
+ singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = "3" );
+ if( not isnull( singleShiftConfig ) ){
if( line.Tips().LikeUserLocale( "淇濆吇" )){
- if( singleShiftConfig.SingleShiftName() = "鐧界彮"){
- singleShiftVolume1 := 0.0;
- }else if( singleShiftConfig.SingleShiftName() = "浜岀彮"){
- singleShiftVolume2 := singleShiftConfig.StandardYield();
- }else if( singleShiftConfig.SingleShiftName() = "涓夌彮"){
- singleShiftVolume3 := singleShiftConfig.StandardYield();
- }
+ singleShiftVolume1 := 0.0;
+ singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
+ singleShiftVolume3 := singleShiftConfig.ThirdSingleShiftQuantity();
}else{
- if( singleShiftConfig.SingleShiftName() = "鐧界彮"){
- singleShiftVolume1 := singleShiftConfig.StandardYield();
- }else if( singleShiftConfig.SingleShiftName() = "浜岀彮"){
- singleShiftVolume2 := singleShiftConfig.StandardYield();
- }else if( singleShiftConfig.SingleShiftName() = "涓夌彮"){
- singleShiftVolume3 := singleShiftConfig.StandardYield();
- }
+ singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity();
+ singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
+ singleShiftVolume3 := singleShiftConfig.ThirdSingleShiftQuantity();
+ }
+ }else{
+ if( line.Tips().LikeUserLocale( "淇濆吇" )){
+ singleShiftVolume1 := 0.0;
+ singleShiftVolume2 := lineQuantity / 2;
+ singleShiftVolume3 := lineQuantity / 2;
+ }else{
+ singleShiftVolume1 := lineQuantity / 3;
+ singleShiftVolume2 := lineQuantity / 3;
+ singleShiftVolume3 := lineQuantity / 3;
}
}
@@ -219,20 +221,22 @@
singleShiftVolume1 := 0.0;
singleShiftVolume2 := 0.0;
- singleShiftConfigs := selectset( unit,SingleShiftConfig,config,config.ShiftName() = line.ShiftName() );
- traverse( singleShiftConfigs,Elements,singleShiftConfig ){
+ singleShiftConfig := select( unit,SingleShiftConfig,config,config.ShiftName() = line.ShiftName() );
+ if( not isnull( singleShiftConfig )){
if( line.Tips().LikeUserLocale( "淇濆吇" )){
- if( singleShiftConfig.SingleShiftName() = "鐧界彮"){
- singleShiftVolume1 := 0.0;
- }else if( singleShiftConfig.SingleShiftName() = "浜岀彮"){
- singleShiftVolume2 := singleShiftConfig.StandardYield();
- }
+ singleShiftVolume1 := 0.0;
+ singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
}else{
- if( singleShiftConfig.SingleShiftName() = "鐧界彮"){
- singleShiftVolume1 := singleShiftConfig.StandardYield();
- }else if( singleShiftConfig.SingleShiftName() = "浜岀彮"){
- singleShiftVolume2 := singleShiftConfig.StandardYield();
- }
+ singleShiftVolume1 := singleShiftConfig.FirstSingleShiftQuantity();
+ singleShiftVolume2 := singleShiftConfig.SecondSingleShiftQuantity();
+ }
+ }else{
+ if( line.Tips().LikeUserLocale( "淇濆吇" )){
+ singleShiftVolume1 := 0.0;
+ singleShiftVolume2 := lineQuantity;
+ }else{
+ singleShiftVolume1 := lineQuantity / 2;
+ singleShiftVolume2 := lineQuantity / 2;
}
}
@@ -260,13 +264,7 @@
}
}else if( line.ShiftName() = "1" ){
- singleShiftVolume1 := lineQuantity / 1;
-
- if( line.Tips().LikeUserLocale( "淇濆吇" )){
- singleShiftVolume1 := lineQuantity / 1;
- }else{
- singleShiftVolume1 := lineQuantity / 1;
- }
+ singleShiftVolume1 := lineQuantity;
for( i := tempProducts.Size() - 1;i >= 0; i-- ){
product := tempProducts.Element( i );
@@ -280,7 +278,7 @@
}
}else{
-
+ info( "涓嶆敮鎸佺殑鐝鍚嶇О銆�" + line.ShiftName() + "銆�");
}
}
--
Gitblit v1.9.3