Merge branch 'master' of http://39.100.78.207:1213/tongli/hyh.apsj

# Conflicts:
#	src/main/java/com/aps/entity/Algorithm/OrderMaterialRequirement.java
#	src/main/java/com/aps/service/impl/LanuchServiceImpl.java

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

@@ -132,6 +132,7 @@ public class MaterialRequirementService {
         }
         List<Material> useMaterials=new ArrayList<>();
         Set<String> useMaterialids=new HashSet<>();
+
         if(routingsupportings!=null&&routingsupportings.size()>0)
         {
             List<String> materialIds=new ArrayList<>();
@@ -175,7 +176,7 @@ public class MaterialRequirementService {
                                             allneeded,component.getSpentQty().doubleValue(), component.getMainQty().doubleValue(),operation.Quantity);
                                     orderMaterialRequirement.setBomId(component.getStrId());
                                     if (!material.getMaterialTypeName().equals("MP") && isIsCheckSf) {
-                                        materialIds.add(materialId);
+                                        materialIds.add(materialId);//半成品ID
                                     }
                                     materialRequirementList.add(orderMaterialRequirement);
                                 }
@@ -200,7 +201,7 @@ public class MaterialRequirementService {
                     }
                 }
             }
-
+            //半成品往下继续找
             if(materialIds!=null&&materialIds.size()>0)
             {
                 Map<Integer,Object> reslte1=preloadSfRoutingBomCache(materialIds, routingHeaders, routingsupportings, replaces);
@@ -220,11 +221,9 @@ public class MaterialRequirementService {
                         }
                     }
                 }
-                reslte.put(2,useMaterials);
-
             }
-
         }
+        reslte.put(2,useMaterials);
 
         SaveBomCache(sceneId, routingHeaders, routingsupportings, replaces,useMaterials);
 
@@ -1056,6 +1055,7 @@ if(headers1==null)
 
                 double needed = allneeded;
                 orderMaterial.setRequiredQuantity(needed);
+                orderMaterial.setQjQty(needed);
                 // 查找物料（流式处理替代First）
                 Material material = materials.stream()
                         .filter(m -> m.getId().equals(orderMaterial.getMaterialId()))