From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java
index f45c9b8..bf2b2cd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java
@@ -123,9 +123,8 @@
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
EamEquipmentTransfer entity = eamEquipmentTransferService.getById(id);
- if (entity != null) {
- entity.setDelFlag(CommonConstant.DEL_FLAG_1);
- eamEquipmentTransferService.updateById(entity);
+ if (entity != null && !EquipmentTransferStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
+ eamEquipmentTransferService.removeById(entity);
}
return Result.OK("鍒犻櫎鎴愬姛!");
}
@@ -140,13 +139,12 @@
@ApiOperation(value = "璁惧褰掑睘鍙樺姩-鎵归噺鍒犻櫎", notes = "璁惧褰掑睘鍙樺姩-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
- this.eamEquipmentTransferService.removeByIds(Arrays.asList(ids.split(",")));
List<String> list = Arrays.asList(ids.split(","));
list.forEach(id -> {
EamEquipmentTransfer entity = eamEquipmentTransferService.getById(id);
- if (entity != null) {
+ if (entity != null && !EquipmentTransferStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
entity.setDelFlag(CommonConstant.DEL_FLAG_1);
- eamEquipmentTransferService.updateById(entity);
+ eamEquipmentTransferService.removeById(entity);
}
});
return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
--
Gitblit v1.9.3