配套

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

@@ -2039,8 +2039,8 @@ if(geneDetails!=null&&geneDetails.size()>0)
                         }
                         List<OrderMaterialRequirement> remove=new ArrayList<>();
                          materialRequirementService.CalBom(chromosome,0, totalNeededByMaterial,materials,baseTime.plusSeconds(estimatedStartTime) ,false,remove,null,false);
-                        Optional<LocalDateTime> rawDateOpt = opboms.stream()
-                                .filter(t -> "MP".equals(t.getMaterialTypeName()))
+                        Optional<LocalDateTime> rawDateOpt =  totalNeededByMaterial.values().stream()
+
                                 .map(OrderMaterialRequirement::getUseTime)
                                 .filter(Objects::nonNull)
                                 .max(LocalDateTime::compareTo);

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

@@ -1254,6 +1254,9 @@ if(demand==null)
                if (needed <= 0) {
                    orderMaterial.setYpQty(allneeded - needed);
                    orderMaterial.setQjQty(needed);
+                   orderMaterial.setUseTime(baseTime);
+                   orderMaterial.setPurchaseStartTime(baseTime);
+                   orderMaterial.setPurchaseEndTime(baseTime);
                    if (commitChanges) {
                        remove.add(orderMaterial);
                    }
@@ -1309,6 +1312,9 @@ if(demand==null)
                if (needed <= 0) {
                    orderMaterial.setYpQty(allneeded - needed);
                    orderMaterial.setQjQty(needed);
+                   orderMaterial.setUseTime(baseTime);
+                   orderMaterial.setPurchaseStartTime(baseTime);
+                   orderMaterial.setPurchaseEndTime(baseTime);
                    if (commitChanges) {
                        remove.add(orderMaterial);
                    }
@@ -1378,6 +1384,9 @@ if(demand==null)
                if (needed <= 0) {
                    orderMaterial.setYpQty(allneeded - needed);
                    orderMaterial.setQjQty(needed);
+                   orderMaterial.setUseTime(orderMaterial.getArrivalTime());
+                   orderMaterial.setPurchaseStartTime(baseTime);
+                   orderMaterial.setPurchaseEndTime(baseTime);
                    if (commitChanges) {
                        remove.add(orderMaterial);
                    }