From 425e388128ba159fb9ff714d6bde24caa25e85ef Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 18:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
index 76d2d7c..447f8aa 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.SlEquipment;
import com.ruoyi.management.domain.dto.InventoriesSuppDTO;
import com.ruoyi.management.domain.dto.InventoriesSuppliesQuery;
import com.ruoyi.management.domain.dto.SlEquipmentDTO;
@@ -11,6 +12,7 @@
import com.ruoyi.management.domain.vo.SlEquipmentVO;
import com.ruoyi.management.service.InventoriesSuppliesService;
import com.ruoyi.management.service.SlEquipmentService;
+import com.ruoyi.system.api.domain.SeBei;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -50,7 +52,9 @@
@DeleteMapping("/{id}")
public R<?> delSlEquipment(
@ApiParam(name = "id", value = "设备管理id", required = true) @PathVariable("id") Long id) {
- slEquipmentService.removeById(id);
+ SlEquipment byId = slEquipmentService.getById(id);
+ byId.setDelFlag("1");
+ slEquipmentService.updateById(byId);
return R.ok();
}
@@ -61,4 +65,12 @@
}
+ @PostMapping("/getequipmente")
+ public R<Integer> getequipmente(@RequestBody SeBei seBei){
+
+ return R.ok(slEquipmentService.getequipmente(seBei));
+
+ }
+
+
}
--
Gitblit v1.7.1