导入时，按照产品名称和项目名称组合去匹配产品

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -645,7 +645,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     if(productOrderNumCell!=null&&!StringUtils.isEmpty(productOrderNumCell.getStringCellValue())){
                         plan.setProductOrderNum(productOrderNumCell.getStringCellValue());
                     }
-                    if(projectNameCell!=null&&!StringUtils.isEmpty(productNameCell.getStringCellValue())){
+                    if(projectNameCell!=null&&!StringUtils.isEmpty(projectNameCell.getStringCellValue())){
                         plan.setProjectName(projectNameCell.getStringCellValue());
                     }
                     if(columnNumCell!=null&&StringUtils.isEmpty(columnNumCell.getStringCellValue())){
@@ -692,7 +692,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                         }
                     }
                     if(productNameCell!=null){
-                        Optional<Product> first = productList.stream().filter(pl -> pl.getName().equals(productNameCell.getStringCellValue())).findFirst();
+                        Optional<Product> first = productList.stream().filter(pl -> pl.getName().equals(productNameCell.getStringCellValue()) && projectNameCell.getStringCellValue().equals(pl.getProjectName())).findFirst();
                         if(first.isPresent()){
                             plan.setProductId(first.get().getId());
                             plan.setProductName(first.get().getName());