Commit 06370558 by yukang

物料导入层级逻辑新增

parent 3b9c29b6
...@@ -169,7 +169,7 @@ public class ServiceHPSC001 extends ServiceBase { ...@@ -169,7 +169,7 @@ public class ServiceHPSC001 extends ServiceBase {
return eiInfo; return eiInfo;
} }
eiInfo.setStatus(EiConstant.STATUS_SUCCESS); eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
eiInfo.setMsg("删除成功!"); eiInfo.setMsg("提交成功!");
return eiInfo; return eiInfo;
} }
......
...@@ -266,8 +266,8 @@ public class ExcelUtils { ...@@ -266,8 +266,8 @@ public class ExcelUtils {
if (HPSC002.getLv() == 2 && HPSC002.getPrdtType() != 4) { if (HPSC002.getLv() == 2 && HPSC002.getPrdtType() != 4) {
sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误,当前层级只能导入部件清单!!"); sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误,当前层级只能导入部件清单!!");
checkStatus = true; checkStatus = true;
} else if (HPSC002.getLv() == 3 && HPSC002.getPrdtType() != 3) { } else if (HPSC002.getLv() == 3 && (HPSC002.getPrdtType() != 3 || HPSC002.getPrdtType() != 5)) {
sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误,当前层级只能导入零件清单!!"); sb.append("导入失败:数据错误"+(i+1)+"条,层级关系错误,当前层级只能导入零件或耗材清单!!");
checkStatus = true; checkStatus = true;
} }
//完善数据 //完善数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment