From 1379930bf17388282befd9997ecf4d338b646832 Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 9 Dec 2024 16:22:41 +0800 Subject: [PATCH] =?UTF-8?q?fix=20#bug44179=20PCN=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E5=8C=96=E6=A3=80=E9=AA=8C=EF=BC=9A=E6=9C=9F=E6=9C=9B=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E7=8A=B6=E6=80=81=E7=9A=84=E6=9D=A1=E7=A0=81=E4=B9=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=81=9A=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesInputDefectRecordService.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 6e3d9f5..ae9d429 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 @@ -15,10 +15,8 @@ import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; @@ -34,7 +32,6 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.codepoetics.protonpack.collectors.CollectorUtils; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -45,6 +42,7 @@ import org.springframework.util.StringUtils; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * @Description : @@ -698,11 +696,11 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService } } - //根据条码状态判断 是不是已下线条码 - //若不是已下线的条码则提示 条码状态 请选择已下线的条码 - if (produceSn.getSnStatus() != MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()) { - throw new ImppBusiException(String.format("【%s】此条码状态为【%s】,请选择状态为【%s】状态的条码", serialNumber, MesExtEnumUtil.PRODUCE_SN_STATUS.valueOfDescription(produceSn.getSnStatus()), - MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getDescription())); + //根据条码状态判断 是不是创建或已下线条码 + //若不是创建或已下线的条码则提示 条码状态 请选择创建或已下线的条码 + if (!Stream.of(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue(),MesExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()).collect(Collectors.toList()).contains(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())); } return produceSn;