From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 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 new file mode 100644 index 0000000..2734032 --- /dev/null +++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolSharpeningController.java @@ -0,0 +1,139 @@ +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.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description: 鍒�鍏峰垉纾ㄨ褰� 鎺у埗鍣� + * @Author: houjie + * @Date: 2025-05-10 + */ +@RestController +@RequestMapping("/tms/toolSharpening") +@Api(tags = "鍒�鍏峰垉纾ㄨ褰曠鐞�") +public class ToolSharpeningController { + + @Autowired + private IToolsSharpeningService toolSharpeningService; + + + + + @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); + } + + /** + * 鏌ヨ鎵�鏈夋暟鎹� + */ + @GetMapping("/all") + @ApiOperation(value = "鏌ヨ鎵�鏈夋暟鎹�", notes = "鏌ヨ鎵�鏈夋暟鎹�") + public Result<List<ToolSharpening>> queryAll() { + List<ToolSharpening> list = toolSharpeningService.list(); + return Result.OK(list); + } + + /** + * 鏍规嵁ID鏌ヨ + */ + @GetMapping("/{id}") + @ApiOperation(value = "鏍规嵁ID鏌ヨ", notes = "鏍规嵁ID鏌ヨ") + public Result<ToolSharpening> queryById(@PathVariable String id) { + ToolSharpening entity = toolSharpeningService.getById(id); + return Result.OK(entity); + } + + + @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("娣诲姞鎴愬姛锛�"); + } +// /** +// * 淇敼 +// */ +// @PutMapping +// @ApiOperation(value = "淇敼", notes = "淇敼") +// public Result<ToolSharpening> edit(@RequestBody ToolSharpening toolSharpening) { +// toolSharpeningService.updateById(toolSharpening); +// return Result.OK(toolSharpening); +// } + + /** + * 缂栬緫 + * + * @param toolSharpening + * @return + */ + @AutoLog(value = "tms_tool_sharpening-缂栬緫") + @ApiOperation(value="tms_tool_sharpening-缂栬緫", notes="tms_tool_sharpening-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<String> edit(@RequestBody ToolSharpening toolSharpening) { + toolSharpeningService.updateById(toolSharpening); + return Result.OK("缂栬緫鎴愬姛!"); + } + + + /** + * 鍒犻櫎 + */ + + @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("鍒犻櫎鎴愬姛!"); + } + + /** + * 宸ュ叿鍙拌处-鍒冪(瀛愰〉闈㈠垪琛ㄦ煡璇� + * + * @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