|
|
|
@ -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()));
|
|
|
|
|
}
|
|
|
|
|