diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java index 241778b..fb06ad8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java @@ -1095,6 +1095,20 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService { MesReworkTask res = mesReworkTaskRepository.getByProperty(packBean); if (res == null) { + // 先判断是否有初判信息 + //根据条码找最近一条单据 + if (!StringUtils.isEmpty(requestModel.getSn())) { + DdlPackBean partInspectionPackBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(requestModel.getSn(), "sn", partInspectionPackBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean); + MesPartInspection partInspection = mesPartInspectionRepository.getByProperty(packBean); + if (partInspection == null) { + throw new ImppBusiException(String.format("条码:%s,还未进行初判", requestModel.getSn())); + } + if (Objects.equals(MesExtEnumUtil.PART_INSPECTION_NC_STATUS.CREATE.getValue(),partInspection.getNcStatus())) { + throw new ImppBusiException(String.format("条码:%s,还未进行NC处理", requestModel.getSn())); + } + } throw new ImppBusiException("返工单信息不存在"); }