From 0aafe49643fb0bb2364726831133c89ebb1475b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Thu, 9 Jan 2025 17:15:45 +0800 Subject: [PATCH] =?UTF-8?q?2025-1-9=20DEVICE=20-=20=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=97=AE=E9=A2=98=20-=E6=8F=90=E9=86=92?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/device/mapper/EquOrderMapper.java | 2 ++ .../op/device/service/impl/EquRepairOrderServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/device/EquOrderMapper.xml | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 096a88494..eff308f37 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -190,4 +190,6 @@ public interface EquOrderMapper { //获取组线信息 String getGroupLine(String auxiliaryEquipmentCode); + + String selectEquipment(String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index 3bed1b98b..23528ba16 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -11,6 +11,7 @@ import java.util.stream.Collectors; import com.alibaba.fastjson2.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.BaseFileData; +import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.uuid.IdUtils; @@ -249,6 +250,12 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { @Override @DS("#header.poolName") public int checkEquRepairOrder(EquRepairOrder equRepairOrder) { + //查询设备是否存在 + String equipment = equOrderMapper.selectEquipment(equRepairOrder.getEquipmentCode()); + if(StringUtils.isBlank(equipment)){ + throw new ServiceException("该设备不存在,请联系系统相关人员。"); + } + String code = equRepairOrder.getOrderCode().substring(10); //不生成流水号,从报修单号第十位开始切割、拼接 String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code; if (equRepairOrder.getOrderSource().equals("点检") || equRepairOrder.getOrderSource().equals("巡检")) { //判断是否是点检、巡检过来的 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index 2f4f953bd..c77d63b19 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -300,6 +300,10 @@ select equipment_name AS 'equipmentName' from base_equipment where equipment_code = #{equipmentCode} and del_flag = '0' + + insert into equ_order