From 5b334f63a33646b57a428c647bad9894cd3f3068 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 15:40:00 +0800
Subject: [PATCH] feat: 新增工艺路线、工艺路线绑定工序、工序新增参数
---
src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
index d55c2c9..5c631e7 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -1,13 +1,20 @@
package com.ruoyi.production.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteItemDto;
+import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProcessRouteItemService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
@@ -25,13 +32,22 @@
return R.ok(processRouteItemService.listProcessRouteItemDto(processRouteItemDto));
}
- @PostMapping ()
- public R add(@RequestBody List<ProcessRouteItem> processRouteItem) {
- return R.ok(processRouteItemService.saveBatch(processRouteItem));
+ @PostMapping()
+ @ApiOperation("鏂板淇敼宸ュ簭")
+ public R addOrUpdate(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.saveOrUpdateProcess(processRouteItem));
}
- @PutMapping ()
- public R update(@RequestBody List<ProcessRouteItem> processRouteItem) {
- processRouteItemService.remove(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRouteItem.get(0).getRouteId()));
- return R.ok(processRouteItemService.saveBatch(processRouteItem));
+
+ @PostMapping("/sort")
+ @ApiOperation("鎺掑簭")
+ public R sort(@RequestBody ProcessRouteItem processRouteItem) {
+ return R.ok(processRouteItemService.sort(processRouteItem));
+ }
+
+ @ApiOperation("鍒犻櫎宸ヨ壓璺嚎鏄庣粏")
+ @DeleteMapping("/batchDelete/{id}")
+ @Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
+ public AjaxResult batchDelete(@PathVariable("id") Long id) {
+ return AjaxResult.success(processRouteItemService.batchDelete(id));
}
}
--
Gitblit v1.9.3