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,