diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java index 3fd1f19..ceb5fcc 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesBoxingErrorProofingService.java @@ -133,12 +133,12 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer } mesPackage = mesPackageRDao.insert(getMesPackage(mesPackageDetail, mesPart, qty, packingDefine,packageOneCode)); } - return ResultBean.success("箱条码扫描成功,请扫产品条码!").setResultObject(mesPackage); + return ResultBean.success("箱条码扫描成功,请扫零件条码!").setResultObject(mesPackage); } else { checkNotNull(mesPackageDetail); - //校验过程条码是否存在 + //校验零件条码是否存在 if (StringUtils.isEmpty(mesPackageDetail.getSerialNumber())) { - MesPcnException.throwMesBusiException("过程条码不允许为空,请检查数据!"); + MesPcnException.throwMesBusiException("零件条码不允许为空,请检查数据!"); } //校验包装条码信息 MesPackage mesPackage = getMesPackageAndCheck(mesPackageDetail.getPackageNo(), mesPackageDetail.getOrganizeCode()); @@ -162,7 +162,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ return ResultBean.success("当前箱条码已完成装箱,请扫描下一个箱条码!").setResultObject(mesPackage); } - return ResultBean.success("产品条码扫描成功,请继续扫描产品条码!").setResultObject(mesPackage); + return ResultBean.success("零件条码扫描成功,请继续扫描零件条码!").setResultObject(mesPackage); } } @@ -188,7 +188,7 @@ public class MesBoxingErrorProofingService implements IMesBoxingErrorProofingSer if(mesPackage.getIsSealed() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ return ResultBean.success("当前箱条码已完成装箱,请扫描下一个箱条码!").setResultObject(mesPackage); } - return ResultBean.success("提交成功,请继续扫描产品条码!").setResultObject(mesPackage); + return ResultBean.success("提交成功,请继续扫描零件条码!").setResultObject(mesPackage); } @Override