From f0a3faa7da2caf5fe786b8619bea6cb30d9ce5d1 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 12 Dec 2024 14:01:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=20#44263=20PCN=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E9=98=B2=E9=94=99=EF=BC=9A=E6=BB=A1=E7=AE=B1=E5=85=B3=E7=AE=B1?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=AE=B1=E6=9D=A1=E7=A0=81=E5=B7=B2=E5=AE=8C=E6=88=90=E8=A3=85?= =?UTF-8?q?=E7=AE=B1=E3=80=82=E8=AF=B7=E6=89=AB=E6=8F=8F=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=AE=B1=E6=9D=A1=E7=A0=81=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesBoxingErrorProofingService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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