功能修改-sjx

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java

@@ -2174,27 +2174,27 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             int x = partCz.size();
             int y = partBlb.size();
             if (sumOfQuota <= 5) {
-                result = (5.5 * sumOfQuota + 20) / 60 + 0.8;
+                result = (6.2 * sumOfQuota + 20) / 60 + 0.8;
             }
             if (sumOfQuota <= 20 && sumOfQuota > 5) {
-                result = (5.8 * sumOfQuota + 20) / 60 + 0.8;
+                result = (6.2 * sumOfQuota + 20) / 60 + 0.8;
                 if (y > 2) {
                     result = 1.5 * result;
                 }
                 if (hb) {
-                    result = result + 0.5 * sumOfQuota / 60 + 0.2;
+                    result = result + 1 * sumOfQuota / 60 + 0.2;
                 }
                 if (x > 3) {
                     result = 1.2 * result + 3;
                 }
             }
             if (sumOfQuota <= 30 && sumOfQuota > 20) {
-                result = (6 * sumOfQuota + 20) / 60 + 0.8;
+                result = (6.5 * sumOfQuota + 20) / 60 + 0.8;
                 if (y > 2) {
                     result = 1.6 * result;
                 }
                 if (hb) {
-                    result = result + (1 * sumOfQuota) / 60 + 0.2;
+                    result = result + (1.3 * sumOfQuota) / 60 + 0.2;
                 }
                 if (x > 3) {
                     result = 1.5 * result + 5;
@@ -2206,7 +2206,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     result = 1.8 * result;
                 }
                 if (hb) {
-                    result = result + (2 * sumOfQuota) / 60 + 0.3;
+                    result = result + (2 * sumOfQuota) / 60 + 1;
                 }
                 if (x > 3) {
                     result = 1.8 * result + 6;
@@ -2215,10 +2215,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             if (sumOfQuota <= 80 && sumOfQuota > 50) {
                 result = (6.4 * sumOfQuota + 25) / 60 + 1.5;
                 if (y > 2) {
-                    result = 2 * result;
+                    result = 2.1 * result;
                 }
                 if (hb) {
-                    result = result + (3 * sumOfQuota) / 60 + 0.5;
+                    result = result + (3 * sumOfQuota) / 60 + 1.5;
                 }
                 if (x > 3) {
                     result = 2.2 * result + 9;
@@ -2227,10 +2227,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             if (sumOfQuota <= 100 && sumOfQuota > 80) {
                 result = (6.5 * sumOfQuota + 25) / 60 + 1.8;
                 if (y > 2) {
-                    result = 2 * result;
+                    result = 2.1 * result;
                 }
                 if (hb) {
-                    result = result + (3.5 * sumOfQuota) / 60 + 0.7;
+                    result = result + (3.5 * sumOfQuota) / 60 + 2;
                 }
                 if (x > 3) {
                     result = 2.5 * result + 12;
@@ -2242,7 +2242,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     result = 2 * result;
                 }
                 if (hb) {
-                    result = result + (4 * sumOfQuota) / 60 + 1;
+                    result = result + (4 * sumOfQuota) / 60 + 3;
                 }
                 if (x > 3) {
                     result = 2.5 * result + 15;