From 80348cce3548ba23023f584c471cb176ce015af5 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 09:40:17 +0800
Subject: [PATCH] 工具报损/刀具刃磨 修改
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
index 67bed48..beeaecb 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java
@@ -6,6 +6,7 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tms.entity.OutStoreDetail;
import org.jeecg.modules.tms.entity.ToolLedger;
import org.jeecg.modules.tms.entity.ToolSharpening;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
@@ -88,6 +89,7 @@
@ApiOperation(value="tms_tool_sharpening-娣诲姞", notes="tms_tool_sharpening-娣诲姞")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody ToolSharpening toolSharpening) {
+ toolSharpening.setSharpeningStatus("1");
toolSharpeningService.save(toolSharpening);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -101,13 +103,37 @@
return Result.OK(toolSharpening);
}
+
+
+
/**
* 鍒犻櫎
*/
- @DeleteMapping("/{id}")
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎")
- public Result<String> delete(@PathVariable String id) {
+
+ @AutoLog(value = "tms_tool_sharpening-閫氳繃id鍒犻櫎")
+ @ApiOperation(value="tms_tool_sharpening-閫氳繃id鍒犻櫎", notes="tms_tool_sharpening-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
toolSharpeningService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛");
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�
+ *
+ * @param toolSharpening
+ * @param pageNo
+ * @param pageSize
+ * @param query
+ * @return
+ */
+ @ApiOperation(value="宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�", notes="宸ュ叿鍙拌处-鍒冪（瀛愰〉闈㈠垪琛ㄦ煡璇�")
+ @GetMapping(value = "/toolSharpeningList")
+ public Result<?> toolSharpeningList(ToolSharpening toolSharpening,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ @RequestParam Map<String, String> query) {
+ IPage<Map<String, Object>> pageList = toolSharpeningService.toolSharpeningList(pageNo,pageSize, query);
+ return Result.OK(pageList);
}
}
--
Gitblit v1.9.3