From 1eb6f4824c270de1a3d0bf766d44f1abb2c7f55d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 24 四月 2025 17:30:07 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单字段 及 生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java | 2 ++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java | 2 +-
platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java | 16 ++++++++++++++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java | 2 +-
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java | 11 +++++++++++
5 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java
index a56ab76..5429c32 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/constant/CommonStatusContant.java
@@ -160,5 +160,21 @@
* 璁惧閲囪喘璁″垝鐘舵��-寰呭鎵�
*/
Integer DEVICE_PURCHASE_STATUS_APPROVED = 1;
+ /**
+ * 璁惧鐩樼偣璁″垝鐘舵��-寰呭鎵�
+ */
+ Integer DEVICE_STOCKTAKING_STATUS_APPROVED = 0;
+ /**
+ * 璁惧鐩樼偣璁″垝鐘舵��-寰呯敓鎴�
+ */
+ Integer DEVICE_STOCKTAKING_STATUS_GEN = 1;
+ /**
+ * 璁惧鐩樼偣璁″垝鐘舵��-鐩樼偣涓�
+ */
+ Integer DEVICE_STOCKTAKING_STATUS_STOCKTATING = 2;
+ /**
+ * 璁惧鐩樼偣璁″垝鐘舵��-瀹屾垚
+ */
+ Integer DEVICE_STOCKTAKING_STATUS_COMPLETE = 3;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java
index 21f84a0..af1d760 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ResidualRecycle.java
@@ -30,7 +30,7 @@
* 璁惧缂栫爜
*/
@Schema(description="璁惧缂栫爜")
- @Column(columnDefinition="VARCHAR(16) comment '璁惧缂栫爜'")
+ @Column(columnDefinition="VARCHAR(64 ) comment '璁惧缂栫爜'")
private String deviceCode;
/**
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
index afd650b..fc909c6 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/WorkOrderController.java
@@ -79,7 +79,7 @@
@PostMapping
@PreAuthorize("@pms.hasPermission('device_workOrder_add')" )
public R save(@RequestBody WorkOrder workOrder) {
- return R.ok(workOrderService.save(workOrder));
+ return workOrderService.saveNew(workOrder);
}
/**
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java
index 6924b1d..d65ae48 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/WorkOrderService.java
@@ -7,4 +7,6 @@
public interface WorkOrderService extends IService<WorkOrder> {
R updateByIdNew(WorkOrder workOrder);
+
+ R saveNew(WorkOrder workOrder);
}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java
index dff8d95..93c1b16 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/WorkOrderServiceImpl.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.device.constant.CommonStatusContant;
+import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.entity.DeviceRepair;
import com.by4cloud.platformx.device.entity.WorkOrder;
import com.by4cloud.platformx.device.mapper.DeviceInventoryMapper;
import com.by4cloud.platformx.device.mapper.DeviceRepairMapper;
import com.by4cloud.platformx.device.mapper.WorkOrderMapper;
+import com.by4cloud.platformx.device.service.JcMaxSizeService;
import com.by4cloud.platformx.device.service.WorkOrderService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -24,6 +26,7 @@
private final DeviceRepairMapper repairMapper;
private final DeviceInventoryMapper inventoryMapper;
+ private final JcMaxSizeService maxSizeService;
@Override
public R updateByIdNew(WorkOrder workOrder) {
@@ -50,4 +53,12 @@
return R.ok();
}
+
+ @Override
+ public R saveNew(WorkOrder workOrder) {
+ workOrder.setWoCode(maxSizeService.nextNo(MaxSizeContant.DEVICE_PURCHASE_CODE));
+ workOrder.setWoStatus(CommonStatusContant.WORK_ORDER_STATUS_CLOSING);
+ baseMapper.insert(workOrder);
+ return R.ok();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1