From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
index a0fbad9..b02edfc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentSealUpServiceImpl.java
@@ -20,10 +20,8 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentSealUpStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.entity.EamEquipmentSealUp;
import org.jeecg.modules.eam.mapper.EamEquipmentSealUpMapper;
import org.jeecg.modules.eam.request.EamEquipmentSealUpQuery;
@@ -124,7 +122,6 @@
} else {
queryWrapper.orderByDesc("wmo.create_time");
}
-
return equipmentSealUpMapper.queryPageList(page, queryWrapper);
}
@@ -213,7 +210,7 @@
if (result != null) {
entity.setSealEndTime(new Date());
entity.setSealStatus(EquipmentSealUpStatusEnum.WAIT_UNSEALING_AUDIT.name());
- //淇濆瓨宸ュ崟
+ //淇濆瓨宸ュ崟
equipmentSealUpMapper.updateById(entity);
return result.isSuccess();
}
@@ -320,7 +317,7 @@
Map<String, Object> values = new HashMap<>();
switch (status) {
// 瀹℃壒
- case WAIT_UNSEALING_AUDIT:
+ case WAIT_CHECK:
//鎵ц瀹屾垚
values.put("dataId", entity.getId());
values.put("organization", request.getApprovalComment());
@@ -346,7 +343,7 @@
}
break;
// 宸插皝瀛�
- case SEALED:
+ case WAIT_UNSEALING_AUDIT:
values.put("dataId", entity.getId());
values.put("organization", request.getUnsealApprovalComment());
values.put("comment", request.getUnsealApprovalComment());
@@ -360,11 +357,11 @@
} else {
//璁剧疆entity
entity.setSealStatus(EquipmentSealUpStatusEnum.SEALED.name());
+ entity.setSealEndTime(null);
}
entity.setUnsealApprovalUser(user.getUsername());
entity.setUnsealApprovalComment(request.getUnsealApprovalComment());
entity.setUnsealApprovalTime(new Date());
-
// 淇敼璁惧鐘舵��
equipment.setAssetStatus(AssetStatusEnum.NORMAL.name());
eamEquipmentService.updateById(equipment);
--
Gitblit v1.9.3