Merge remote-tracking branch 'origin/master'

cuijian

2025-06-16 ec1bf4658e36a17f971a54007920a44c5378b7dc

 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: 刀具刃磨记录 控制器
@@ -26,18 +36,20 @@
    @Autowired
    private IToolsSharpeningService toolSharpeningService;

    /**
     * 分页查询
     */
    @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,33 +72,68 @@
        return Result.OK(entity);
    }

    /**
     * 新增
     */
    @PostMapping
    @ApiOperation(value = "新增", notes = "新增")
    public Result<ToolSharpening> add(@RequestBody ToolSharpening 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(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
     */
    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    public Result<ToolSharpening> edit(@RequestBody ToolSharpening toolSharpening) {
    @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(toolSharpening);
        return Result.OK("编辑成功!");
    }


    /**
     * 删除
     */
    @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);
    }
}