From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务  设备维修新增是否生成工单

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
index b4d5526..9f287e0 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceRepairServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.dto.DeviceRepairQueryDTO;
 import com.by4cloud.platformx.device.entity.DeviceInventory;
@@ -33,10 +34,10 @@
 	@Override
 	public R approved(Long id) {
 		DeviceRepair repair = baseMapper.selectById(id);
-		repair.setStatus(2);
+		repair.setStatus(CommonStatusContant.DEVICE_REPAIR_STATUS_REPAIRING);
 		baseMapper.updateById(repair);
 		DeviceInventory inventory = inventoryMapper.selectById(repair.getInventoryId());
-		inventory.setInventoryStatus(3);
+		inventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_REPAIRING);
 		inventoryMapper.updateById(inventory);
 		return R.ok();
 	}
@@ -44,10 +45,10 @@
 	@Override
 	public R complete(Long id) {
 		DeviceRepair repair = baseMapper.selectById(id);
-		repair.setStatus(3);
+		repair.setStatus(CommonStatusContant.DEVICE_REPAIR_STATUS_COMPLETE);
 		baseMapper.updateById(repair);
 		DeviceInventory inventory = inventoryMapper.selectById(repair.getInventoryId());
-		inventory.setInventoryStatus(1);
+		inventory.setInventoryStatus(CommonStatusContant.DEVICE_INVENTORY_USABLE);
 		inventoryMapper.updateById(inventory);
 		return R.ok();
 	}
@@ -64,10 +65,10 @@
 		workOrder.setRepairId(id);
 		workOrder.setWoCode(maxSizeService.nextNo(MaxSizeContant.DEVICE_PURCHASE_CODE));
 		workOrder.setWoDesc(repair.getRepairDesc());
-		workOrder.setWoType(1);
-		workOrder.setWoStatus(1);
+		workOrder.setWoType(CommonStatusContant.WORK_ORDER_TYPE_REPAIR);
+		workOrder.setWoStatus(CommonStatusContant.WORK_ORDER_STATUS_ALLOCATED);
 		workOrderMapper.insert(workOrder);
-		repair.setWoFlag(1);
+		repair.setWoFlag(CommonStatusContant.DEVICE_REPAIR_FLAG_Y);
 		baseMapper.updateById(repair);
 		return R.ok();
 	}

--
Gitblit v1.9.1