配套

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