Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

yuan

5 天以前 66d041ed14b3ed3ed7183a28a5c588e235fc21d0

 src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
@@ -43,8 +45,9 @@
    /**
     * 新增工艺路线。
     */
    @PostMapping("/addTechRoute")
    @Log(title = "工艺路线", businessType = BusinessType.INSERT)
    @Operation(summary = "新增工艺路线")
    @PostMapping("/addTechRoute")
    public R add(@RequestBody TechnologyRouting technologyRouting) {
        return R.ok(technologyRoutingService.saveTechnologyRouting(technologyRouting));
    }
@@ -52,8 +55,9 @@
    /**
     * 修改工艺路线。
     */
    @PutMapping("/editTechRoute")
    @Log(title = "工艺路线", businessType = BusinessType.UPDATE)
    @Operation(summary = "修改工艺路线")
    @PutMapping("/editTechRoute")
    public R edit(@RequestBody TechnologyRouting technologyRouting) {
        return R.ok(technologyRoutingService.updateTechnologyRouting(technologyRouting));
    }
@@ -61,11 +65,11 @@
    /**
     * 批量删除工艺路线。
     */
    @DeleteMapping("/delete")
    @Log(title = "工艺路线", businessType = BusinessType.DELETE)
    @Operation(summary = "删除工艺路线")
    @DeleteMapping("/delete")
    public R remove(@RequestBody List<Long> ids) {
        return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
    }

    //TODO 增加工艺路线附件上传 @陈海杰
}