From 78f658d1834f78ddf33f7153e035581139a819a7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jan 2025 10:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=2044697=20=E5=88=9B=E5=BB=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index af27561..eb75e2b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -787,7 +787,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService //根据条码状态判断 是不是创建或已下线条码 //若不是创建或已下线的条码则提示 条码状态 请选择创建或已下线的条码 - if (!Stream.of(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue(),MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()).collect(Collectors.toList()).contains(produceSn.getSnStatus())) { + if (!MesExtEnumUtil.PRODUCE_SN_STATUS.checkAllowInputDefectData(produceSn.getSnStatus())) { throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】【%s】状态的条码", serialNumber, MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()), MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getDescription(),MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription())); } @@ -817,7 +817,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService //根据条码状态判断 是不是已下线条码 //若不是已下线的条码则提示 条码状态 请选择已下线的条码 - if (produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()) { + if (!MesExtEnumUtil.PRODUCE_SN_STATUS.checkAllowInputDefectData(produceSn.getSnStatus())) { throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】状态的条码", serialNumber, MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()), MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription())); }