From 5836788a6aabf60014a746b724607e3e965a0d86 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 10 六月 2025 10:51:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 bd1031a..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("娣诲姞鎴愬姛锛�");
}
@@ -115,4 +117,23 @@
toolSharpeningService.removeById(id);
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