Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC001.java

@@ -169,7 +169,7 @@ public class ServiceHPSC001 extends ServiceBase {
             return eiInfo;
         }
         eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
-        eiInfo.setMsg("删除成功！");
+        eiInfo.setMsg("提交成功！");
         return eiInfo;
     }
 

src/main/java/com/baosight/hpjx/util/ExcelUtils.java

@@ -266,8 +266,8 @@ public class ExcelUtils {
 			if (HPSC002.getLv() == 2 && HPSC002.getPrdtType() != 4) {
 				sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误，当前层级只能导入部件清单！！");
 				checkStatus = true;
-			} else if (HPSC002.getLv() == 3 && HPSC002.getPrdtType() != 3) {
-				sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误，当前层级只能导入零件清单！！");
+			} else if (HPSC002.getLv() == 3 && (HPSC002.getPrdtType() != 3 || HPSC002.getPrdtType() != 5)) {
+				sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误，当前层级只能导入零件或耗材清单！！");
 				checkStatus = true;
 			}
 			//完善数据