排程优化-退火合并优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -1893,7 +1893,7 @@ public class ApsServiceImpl implements ApsService {
                 && !processesList.get(0).getProcessType().equals("中退") && !processesList.get(0).getProcessType().equals("小卷成退")
 //                && processesList.get(0).getPreviousProcessesIds() != null && processesList.get(0).getPreviousProcessesIds().size()>0
         ){
-            if("是".equals(processesList.get(0).getIssubsection()) || processesList.get(0).getIfLock()){
+            if(("是".equals(processesList.get(0).getIssubsection()) && nextbsids != null && nextbsids.size()>0) || processesList.get(0).getIfLock()){
                 if(nextbsids != null && nextbsids.size()>0){
                     for (String nextbsid : nextbsids) {
                         fjNextMerge(nextbsid,notMergeProces,mergeprocesses,bsProceses,hasMerge,allProMap);
@@ -2284,7 +2284,7 @@ public class ApsServiceImpl implements ApsService {
         }
         if(zzprocesList.size() == 0){
             for (ProductionProcesses process : apsSolution.getProcessesList()) {
-                if((process.getPreviousProcessesIds() == null || process.getPreviousProcessesIds().size() == 0) && !process.getIfLock()){
+                if((process.getPreviousProcessesIds() == null || process.getPreviousProcessesIds().size() == 0) && !"成退,中退,小卷成退".contains(process.getProcessType()) && !process.getIfLock()){
                     zzprocesList.add(process);
                     otherNotZzFirstProces.add(process);
                 }

rw-aps-server/src/test/java/com/rongwei/rwapsserver/RwApsServerApplicationTests.java

@@ -9,6 +9,8 @@ import org.drools.util.DateUtils;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -47,9 +49,12 @@ class RwApsServerApplicationTests {
                 , DateUtil.parseDateTime("2024-11-26 09:49:00"), DateUnit.MINUTE);
         System.out.println("分钟差："+between);*/
 
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        /*SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         DateTime dateTime = DateUtil.date().offset(DateField.HOUR, 8);
-        System.out.println(dateTime);
+        System.out.println(dateTime);*/
+
+//        System.out.println(new BigDecimal("20").divide(new BigDecimal("0.352"),0, BigDecimal.ROUND_HALF_UP).intValue());
+        System.out.println(new BigDecimal("15").divide(new BigDecimal("57"),2, BigDecimal.ROUND_HALF_UP).setScale(0, RoundingMode.CEILING).intValue());
     }
 
 }