From ad24b7f21e7235b95448fec6833d10cbe551e6c3 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Tue, 10 Jun 2025 11:47:15 +0800 Subject: [PATCH] =?UTF-8?q?46906=20PCN:=20DM202504180005=20=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C=E6=AD=A5=E9=AA=A4=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesReworkTaskServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 ed9c40c..1014f18 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 @@ -1083,6 +1083,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("返工单信息不存在"); }