遗传算法-物料需求

src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java

@@ -261,17 +261,10 @@ if(routingIds.size()==0)
             }
         }
         else {
-             Long routingIds1=headers1.getId().longValue();
              routingIds=headers1.getId().longValue();
-            routingsupportings1= routingsupportings.stream()
-                    .filter(t->t.getRoutingHeaderId().equals(routingIds1))
-                    .collect(Collectors.toList());
-            List<String> routingsupportingids = routingsupportings.stream()
-                    .map(Routingsupporting::getStrId)
-                    .distinct()
-                    .collect(Collectors.toList());
-            routingsupportingreplaces1 =routingsupportingreplaces.stream()
-                    .filter(t->routingsupportingids.contains(t.getStrsupid())).collect(Collectors.toList());
+
+
+
         }
         if(headers1==null)
         {

src/main/java/com/aps/service/Algorithm/RoutingDataService.java

@@ -246,10 +246,13 @@ public class RoutingDataService {
                 .collect(Collectors.toList());
 
         List<Machine> machines=new ArrayList<>();
-
+        List<PlanResource> PlanResources=  _PlanResourceService.lambdaQuery()
+                .eq(PlanResource::getIsdeleted,0)
+                .list();
         for (Long id : MachineIds) {
             Machine machine=new Machine();
             machine.setId(id);
+
             machines.add(machine);
         }
         //节假日
@@ -258,9 +261,7 @@ public class RoutingDataService {
         LambdaQueryWrapper<ProdEquipSpecialCal> ProdEquipSpecialCalWrapper = new LambdaQueryWrapper<>();
         ProdEquipSpecialCalWrapper.eq(ProdEquipSpecialCal::getSceneId, SceneId);
 
-        List<PlanResource> PlanResources=  _PlanResourceService.lambdaQuery()
-                .eq(PlanResource::getIsdeleted,0)
-                .list();
+
 
 
 
@@ -297,13 +298,13 @@ public class RoutingDataService {
                     shifts1.add(shift);
                 }
             }
-            List<PlanResource> PlanResources1 = PlanResources.stream()
-                    .filter(t -> t.getReferenceId() == machine.getId())
-                    .collect(Collectors.toList());
-            if(PlanResources1!=null&&PlanResources1.size()>0)
+            PlanResource PlanResource = PlanResources.stream()
+                    .filter(t -> t.getId() == machine.getId())
+                    .findFirst().orElse(null);
+            if(PlanResource!=null)
             {
-                for (PlanResource PlanResource : PlanResources1) {
-
+                machine.setCode(PlanResource.getCode());
+                machine.setName(PlanResource.getTitle());
                     List<MesShiftWorkSched> ShiftWorkScheds = MesShiftWorkScheds.stream()
                             .filter(t -> (long) t.getWeekWorkSchedId() == PlanResource.getWorkSchedId())
                             .collect(Collectors.toList());
@@ -315,10 +316,13 @@ public class RoutingDataService {
                         shift.setEndDate(LocalDateTime.of(2000, 1, 1, 0, 0, 0));
                         shifts1.add(shift);
                     }
-                }
 
-            }
 
+            }
+            if(shifts1==null)
+            {
+                throw new RuntimeException(String.format("设备%s没有工作日历",machine.getCode().concat("_").concat(machine.getName())) );
+            }
             machine.setShifts(shifts1);
 
             List<ProdEquipSpecialCal> Holidays = ProdEquipSpecialCals.stream()

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -26,7 +26,7 @@ public class PlanResultServiceTest {
     @Test
     public void testExecute() {
 
-        planResultService.execute2("6AF8001449FC4D20A3C9992EC24CBF05");
+        planResultService.execute2("1D233450774C420B9165A6AE6E616F67");
 
 //        LocalDateTime t=   LocalDateTime.of(2025, 11, 15, 6, 51, 11);
 //       List<Integer> opids=new ArrayList<>();