From 3d7358c134aaafc7659adb26cf9a52f9dc54f06e Mon Sep 17 00:00:00 2001 From: jun Date: Sun, 1 Sep 2024 16:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E7=B1=BB=E5=9E=8B=EF=BC=9A=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E3=80=81=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E6=A3=80=EF=BC=8C=E7=82=B9=E5=87=BB=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=90=8E=EF=BC=8C=E9=9C=80=E8=A6=81=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E6=89=AB=E6=8F=8F/=E8=BE=93=E5=85=A5=E8=AE=BE?= =?UTF-8?q?=E5=A4=87ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesSpotCheckOrderService.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 8f41752..00a0b6b 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -141,16 +141,10 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { //校验点检单 checkSpotCheckOrder(model.getSpotCheckOrder()); - + //校验设备信息 if (MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.PROCESS_PARAMETER_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType() || MesExtEnumUtil.SPOT_CHECK_ORDER_TYPE.EQUIPMENT_INSPECTION.getValue() == model.getSpotCheckOrder().getSpotCheckOrderType()) { - MesEquipment mesEquipment = mesEquipmentExtService.getMesEquipment(org, model.getSpotCheckOrder().getEquipCode()); - if (Objects.isNull(mesEquipment)) { - throw new ImppBusiException(String.format("点检单对应的设备【%s】信息不存在", model.getSpotCheckOrder().getEquipCode())); - } - if (StringUtils.isEmpty(mesEquipment.getEquipId()) || !model.getProduceSn().equals(mesEquipment.getEquipId() + "")) { - throw new ImppBusiException(String.format("点检单对应的设备编号【%s】和扫描的设备编号【%s】不匹配，请检查数据", mesEquipment.getEquipId(), model.getProduceSn())); - } + checkEquipment(model, org); return model; } else { //检查条码 @@ -624,5 +618,15 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { return produceSn; } + private void checkEquipment(MesSpotCheckOrderModel model, String org) { + MesEquipment mesEquipment = mesEquipmentExtService.getMesEquipment(org, model.getSpotCheckOrder().getEquipCode()); + if (Objects.isNull(mesEquipment)) { + throw new ImppBusiException(String.format("点检单对应的设备【%s】信息不存在", model.getSpotCheckOrder().getEquipCode())); + } + if (StringUtils.isEmpty(mesEquipment.getEquipId()) || !model.getProduceSn().equals(mesEquipment.getEquipId() + "")) { + throw new ImppBusiException(String.format("点检单对应的设备编号【%s】和扫描的设备编号【%s】不匹配，请检查数据", mesEquipment.getEquipId(), model.getProduceSn())); + } + } + }