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 | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 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 fde6ac2..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
@@ -1,8 +1,16 @@
package org.jeecg.modules.tms.controller;
import java.util.List;
+import java.util.Map;
+
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;
+import org.jeecg.modules.tms.entity.vo.ToolSharpeningVo;
import org.jeecg.modules.tms.service.IToolsSharpeningService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -12,6 +20,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
/**
* @Description: 鍒�鍏峰垉纾ㄨ褰� 鎺у埗鍣�
@@ -29,15 +39,29 @@
/**
* 鍒嗛〉鏌ヨ
*/
- @GetMapping("/list")
- @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
- public Result<IPage<ToolSharpening>> queryPageList(ToolSharpening toolSharpening,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
- Page<ToolSharpening> page = new Page<>(pageNo, pageSize);
- QueryWrapper<ToolSharpening> queryWrapper = new QueryWrapper<>(toolSharpening);
- IPage<ToolSharpening> iPage = toolSharpeningService.page(page, queryWrapper);
- return Result.OK(iPage);
+// @GetMapping("/list")
+// @ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
+// public Result<IPage<ToolSharpening>> queryPageList(ToolSharpening toolSharpening,
+// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+// Page<ToolSharpening> page = new Page<>(pageNo, pageSize);
+// QueryWrapper<ToolSharpening> queryWrapper = new QueryWrapper<>(toolSharpening);
+// IPage<ToolSharpening> iPage = toolSharpeningService.page(page, queryWrapper);
+// return Result.OK(iPage);
+// }
+
+
+ @ApiOperation(value="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
+ @GetMapping(value = "/listToolSharpening")
+ public Result<IPage<ToolSharpeningVo>> listToolSharpening(ToolSharpeningVo toolSharpeningVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<ToolSharpeningVo> queryWrapper = QueryGenerator.initQueryWrapper(toolSharpeningVo, parameterMap);
+ Page<ToolSharpeningVo> page = new Page<ToolSharpeningVo>(pageNo, pageSize);
+ IPage<ToolSharpeningVo> pageList = toolSharpeningService.queryPageList(page, parameterMap);
+ return Result.OK(pageList);
}
/**
@@ -60,16 +84,15 @@
return Result.OK(entity);
}
- /**
- * 鏂板
- */
- @PostMapping
- @ApiOperation(value = "鏂板", notes = "鏂板")
- public Result<ToolSharpening> add(@RequestBody ToolSharpening toolSharpening) {
- toolSharpeningService.save(toolSharpening);
- return Result.OK(toolSharpening);
- }
+ @AutoLog(value = "tms_tool_sharpening-娣诲姞")
+ @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("娣诲姞鎴愬姛锛�");
+ }
/**
* 淇敼
*/
@@ -80,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