From 208440cc2db52a90f46148a316cc805aded836c0 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 30 Mar 2023 09:37:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E7=94=9F=E6=88=90=E7=BB=B4?= =?UTF-8?q?=E4=BF=9D=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inv/impl/DeviceInspectOrderServiceImpl.java | 6 +++++- .../resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java index 2ad674a5c..1a67dfca6 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java @@ -123,6 +123,8 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService //查询报修单信息 DeviceRepairOrderEntity deviceRepairOrderEntity = deviceRepairOrderDao.selectByOrderId(repairOrderId); DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity(); + String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd")); + orderEntity.setOrderId(orderId); orderEntity.setCode(deviceRepairOrderEntity.getCode()); orderEntity.setDeptCode(deviceRepairOrderEntity.getDeptCode()); orderEntity.setInvCode(deviceRepairOrderEntity.getInvCode()); @@ -142,11 +144,13 @@ public class DeviceInspectOrderServiceImpl implements DeviceInspectOrderService //查询报修单信息 DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(planOrderId); DeviceInspectOrderEntity orderEntity = new DeviceInspectOrderEntity(); + String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_INSPECT_ORDER, "yyyyMMdd")); + orderEntity.setOrderId(orderId); orderEntity.setCode(deviceInspectPlanEntity.getCode()); orderEntity.setDeptCode(deviceInspectPlanEntity.getDeptCode()); orderEntity.setInvCode(deviceInspectPlanEntity.getInvCode()); orderEntity.setStatus(0); //状态：新增 - orderEntity.setType(1); //维保类型：计划 + orderEntity.setType(2); //维保类型：计划 orderEntity.setDeviceStatus(1); //设备状态：正常 orderEntity.setLastOrderId(planOrderId); orderEntity.setCreateTime(new Date()); diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml index af0d0c726..58b5cbbd4 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectOrderDao.xml @@ -10,6 +10,7 @@ t.status, t.type, t.deviceStatus, + t.lastOrderId, t.createUser, t.auditUser, t.createTime,