From 6da57b610d97be3f79084d43440e7823d707b249 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 04 九月 2025 17:54:55 +0800
Subject: [PATCH] 设备管理调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
index 0c84df2..078d4c2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentLeanOutController.java
@@ -18,6 +18,7 @@
import org.jeecg.modules.eam.constant.EquipmentLeanOutStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipmentLeanOut;
import org.jeecg.modules.eam.request.EamEquipmentLeanOutQuery;
+import org.jeecg.modules.eam.request.EamEquipmentLeanOutRequest;
import org.jeecg.modules.eam.service.IEamEquipmentLeanOutService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -193,7 +194,24 @@
}
/**
- * 缂栬緫
+ * 褰掕繕
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鍊熷嚭褰掕繕-褰掕繕")
+ @ApiOperation(value = "璁惧鍊熷嚭褰掕繕-褰掕繕", notes = "璁惧鍊熷嚭褰掕繕-褰掕繕")
+ @GetMapping(value = "/equipmentReturn")
+ public Result<?> equipmentReturn(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamEquipmentLeanOutService.equipmentReturn(id);
+ if (!b) {
+ return Result.error("鎿嶄綔澶辫触锛�");
+ }
+ return Result.OK("鎿嶄綔鎴愬姛!");
+ }
+
+ /**
+ * 瀹℃壒
*
* @param request
* @return
@@ -201,7 +219,7 @@
@AutoLog(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
@ApiOperation(value = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�", notes = "璁惧鍊熷嚭褰掕繕-瀹℃壒娴�")
@RequestMapping(value = "/approval", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<?> approval(@RequestBody EamEquipmentLeanOut request) {
+ public Result<?> approval(@RequestBody EamEquipmentLeanOutRequest request) {
if (request == null) {
return Result.error("娣诲姞鐨勫璞′笉鑳戒负绌猴紒");
}
--
Gitblit v1.9.3