1

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

@@ -406,24 +406,28 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     prodProcedure.setProductName(productNameCell.getStringCellValue());
                 }else{
                     msg.setError("产品名称不能为空");
+                    return msg;
                 }
                 if(versionNumberCell!=null){
                     prodProcedure.setVersionNumber(versionNumberCell.getStringCellValue());
 
                 }else{
                     msg.setError("版本号不能为空");
+                    return msg;
                 }
                 if(nameCell!=null){
                     prodProcedure.setName(nameCell.getStringCellValue());
 
                 }else{
                     msg.setError("工序名称不能为空");
+                    return msg;
                 }
                 if(workingTimeCell!=null){
                     prodProcedure.setWorkingTime(workingTimeCell.getNumericCellValue());
 
                 }else{
                     msg.setError("单件工时不能为空");
+                    return msg;
                 }
                 if(unitPriceCell!=null){
                     prodProcedure.setUnitPrice(new BigDecimal(unitPriceCell.getNumericCellValue()));
@@ -440,6 +444,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                     }
                 }else{
                     msg.setError("质检类型不能为空");
+                    return msg;
                 }
 
                 prodProcedureList.add(prodProcedure);
@@ -451,7 +456,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
                 if(prodProcedureList.stream().filter(procedure -> {
                     return prodProcedure.getProductName().equals(procedure.getProductName()) && !prodProcedure.getVersionNumber().equals(procedure.getVersionNumber());
                 }).count()>0){
-
                     msg.setError("一个产品只能导入一个版本号");
                     return msg;
                 }