From aace498cfb68dbe74fd5eb1fb53cee226fa010d8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Jun 2025 09:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E5=BC=80=E7=8F=AD?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesProdShiftRecordServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java index 7200fee..54df6f8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java @@ -92,16 +92,14 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService //唯一性校验 DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean); -// DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean); DdlPreparedPack.getIsNull("endTime", packBean); - boolean flg = mesProdShiftRecordRDao.isExitByHql(packBean); - if (flg) { + MesProdShiftRecord prodShiftRecordDb = mesProdShiftRecordRDao.getByProperty(packBean); + if (null != prodShiftRecordDb) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) - .setErrorDetail("开关班记录产线【%s】班组代码【%s】已经存在，请检查数据", - item.getWorkCenterCode(), item.getShiftGroup()) + .setErrorDetail("生产线【%s】已经存在班组【%s】的开班记录，请检查数据", item.getWorkCenterCode(), prodShiftRecordDb.getShiftGroup()) .build(); } ConvertBean.serviceModelInitialize(item, item.getUserInfo());