Merge remote-tracking branch 'origin/tl'

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

@@ -170,6 +170,10 @@ public class MaterialRequirementService {
                                         useMaterials.add(material);
                                         useMaterialids.add(materialId);
                                     }
+                                    if(component.getSpentQty()==null)
+                                    {
+                                      throw new RuntimeException("配套数据有问题，需求数量为空，请检查数据,"+component.getMaterialNumber());
+                                    }
                                     double allneeded = component.getSpentQty().doubleValue()/ component.getMainQty().doubleValue() * operation.Quantity;
 
                                     OrderMaterialRequirement orderMaterialRequirement = CreateMaterialRequirement(material, orderId, "", operation,
@@ -1271,7 +1275,7 @@ if(headers1==null)
         // 按到货时间排序在途物料
         Long CkeckLeadTime=  material.getCkeckLeadTime();
         List<MaterialSupply> sortedInTransit = material.getInTransit().stream()
-                .filter(t -> t.getQuantity() > 0&&t.getArrivalTime().compareTo(earliestStartTime.plusDays(-CkeckLeadTime))<=0 )
+                .filter(t -> t.getQuantity() > 0&&t.getArrivalTime().compareTo(earliestStartTime)<=0 )
                 .sorted(Comparator.comparing(MaterialSupply::getArrivalTime))
                 .collect(Collectors.toList());
 

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -1281,10 +1281,10 @@ private  GlobalParam InitGlobalParam()
                 }
             }
 
-
+            List<MaterialPurchase> materialPurchases=null;
                 if(MaterialPurchaselist!=null&&MaterialPurchaselist.size()>0)
                 {
-                    List<MaterialPurchase> materialPurchases = MaterialPurchaselist.stream()
+                     materialPurchases = MaterialPurchaselist.stream()
                             .filter(t -> t.getMaterialId().equals(m.getId()))
                             .collect(Collectors.toList());
 
@@ -1298,13 +1298,13 @@ private  GlobalParam InitGlobalParam()
             List<MaterialSupply> materialSupplys = new ArrayList<>();
                 if (m.getMaterialTypeName().equals("MP")) {
                     List<PurchaseReceipt> PurchaseReceipts = PurchaseReceiptlist.stream()
-                            .filter(t -> t.getMaterialid() == m.getId())
+                            .filter(t -> t.getMaterialid().equals(m.getId()) )
                             .collect(Collectors.toList());
                     if (PurchaseReceipts != null&&PurchaseReceipts.size()>0) {
 
                         for (PurchaseReceipt mm : PurchaseReceipts) {//原材料待验
                             MaterialSupply ms = new MaterialSupply();
-                            LocalDateTime dt = mm.getExp5() == null ? ParamValidator.parseDateTime(mm.getExp1(), "") : mm.getExp5();
+                            LocalDateTime dt = mm.getExp5() == null ? ParamValidator.parseDateTime(mm.getExp1()+" 00:00:00", "") : mm.getExp5();
                             ms.setQuantity(mm.getFjl1Sl());
                             ms.setArrivalTime(dt);
                             materialSupplys.add(ms);
@@ -1312,12 +1312,29 @@ private  GlobalParam InitGlobalParam()
 
                     }
                     List<ErpPurchaseOrder> ErpPurchaseOrders = ErpPurchaseOrderlist.stream()
-                            .filter(t -> t.getMaterialId() == m.getId())
+                            .filter(t -> t.getMaterialId().equals( m.getId()))
                             .collect(Collectors.toList());
                     if (ErpPurchaseOrders != null&&ErpPurchaseOrders.size()>0) {
                         for (ErpPurchaseOrder mm : ErpPurchaseOrders) {//原材料采购，可用时间要加上检验时间
                             MaterialSupply ms = new MaterialSupply();
-                            LocalDateTime dt = mm.getArrivalDate().plusDays(m.getInspectDuration());
+                            if(mm.getArrivalDate()==null)
+                            {
+                                continue;
+                            }
+                            int checkday=0;
+                            if(materialPurchases!=null&&materialPurchases.size()>0)
+                            {
+                                MaterialPurchase materialPurchase=materialPurchases.stream()
+                                        .filter(t->t.getSupplyId()
+                                                .equals(mm.getManufacturerId()))
+                                        .findFirst().orElse(null);
+                                if(materialPurchase!=null)
+                                {
+                                    checkday=materialPurchase.getInspectionCycle();
+                                }
+                            }
+
+                            LocalDateTime dt = mm.getArrivalDate().plusDays(checkday);
                             ms.setQuantity(mm.getPurchaseQty());
                             ms.setArrivalTime(dt);
                             materialSupplys.add(ms);
@@ -1325,12 +1342,12 @@ private  GlobalParam InitGlobalParam()
                     }
                 } else {
                     List<SjzPfWhStock> SjzPfWhStocks = SjzPfWhStocklists.stream()
-                            .filter(t -> t.getMaterialid() == m.getId())
+                            .filter(t -> t.getMaterialid().equals(m.getId()) )
                             .collect(Collectors.toList());
                     if (SjzPfWhStocks != null&&SjzPfWhStocks.size()>0) {
                         for (SjzPfWhStock mm : SjzPfWhStocks) {//原材料采购，可用时间要加上检验时间
                             MaterialSupply ms = new MaterialSupply();
-                            LocalDateTime dt = ParamValidator.parseDateTime(mm.getExp1(), "");
+                            LocalDateTime dt = ParamValidator.parseDateTime(mm.getExp1()+" 00:00:00", "");
                             ms.setQuantity(mm.getFjl1Sl());
                             ms.setArrivalTime(dt);
                             materialSupplys.add(ms);