配套

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

@@ -2038,7 +2038,7 @@ if(geneDetails!=null&&geneDetails.size()>0)
                             }
                         }
                         List<OrderMaterialRequirement> remove=new ArrayList<>();
-                         materialRequirementService.CalBom(chromosome,0, totalNeededByMaterial,materials,baseTime.plusSeconds(estimatedStartTime) ,false,remove,null,false);
+                         materialRequirementService.CalBom(chromosome,0, totalNeededByMaterial,chromosome.getMaterials(),baseTime.plusSeconds(estimatedStartTime) ,false,remove,null,false);
                         Optional<LocalDateTime> rawDateOpt =  totalNeededByMaterial.values().stream()
 
                                 .map(OrderMaterialRequirement::getUseTime)

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

@@ -1548,6 +1548,7 @@ if(demand==null)
                 .sorted(Comparator.comparing(MaterialSupply::getArrivalTime, Comparator.nullsLast(LocalDateTime::compareTo)))
                 .collect(Collectors.toList());
 
+        if(sortedInTransit!=null&&sortedInTransit.size()>0) {
             for (MaterialSupply supply : sortedInTransit) {
                 double useq = Math.min(needed, supply.getQuantity());
                 if (useq <= 0) {
@@ -1555,7 +1556,7 @@ if(demand==null)
                 }
                 useTransit += useq;
                 needed -= useq;
-            if(commitChanges) {
+                if (commitChanges) {
                     supply.setQuantity(supply.getQuantity() - useq);
                 }
                 if (earliestTime == null || (supply.getArrivalTime() != null && supply.getArrivalTime().isAfter(earliestTime))) {
@@ -1565,7 +1566,7 @@ if(demand==null)
                     break;
                 }
             }
-
+        }
         orderMaterial.setUseTransit(useTransit);
         orderMaterial.setArrivalTime(earliestTime);