From a28e2d43692d0e8d828a6ff09f0a44664ea6f41e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 20 四月 2026 11:25:00 +0800
Subject: [PATCH] feat(technology): 完善工艺路线模块功能
---
src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java | 10 ++++++++++
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java | 10 +++++++---
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 7 +++----
src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java | 10 ++++++++++
src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java | 13 ++++++++-----
5 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
new file mode 100644
index 0000000..af86ada
--- /dev/null
+++ b/src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java
@@ -0,0 +1,10 @@
+package com.ruoyi.technology.bean.dto;
+
+import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "TechnologyRoutingOperationDto瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭鏌ヨ鍙傛暟")
+public class TechnologyRoutingOperationDto extends TechnologyRoutingOperation {
+}
diff --git a/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
new file mode 100644
index 0000000..7090be1
--- /dev/null
+++ b/src/main/java/com/ruoyi/technology/bean/vo/TechnologyRoutingOperationVo.java
@@ -0,0 +1,10 @@
+package com.ruoyi.technology.bean.vo;
+
+import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "TechnologyRoutingOperationVo瀵硅薄", description = "宸ヨ壓璺嚎宸ュ簭杩斿洖瀵硅薄")
+public class TechnologyRoutingOperationVo extends TechnologyRoutingOperation {
+}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
index 9e369ab..e73812a 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingController.java
@@ -1,8 +1,10 @@
package com.ruoyi.technology.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
+import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyRoutingService;
import io.swagger.annotations.Api;
@@ -11,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
@RestController
@RequestMapping("/technologyRouting")
@@ -22,13 +25,13 @@
@GetMapping("/page")
@ApiOperation("宸ヨ壓璺嚎鍒嗛〉鏌ヨ")
- public R page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
+ public R<IPage<TechnologyRoutingVo>> page(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
return R.ok(technologyRoutingService.pageTechnologyRouting(page, technologyRoutingDto));
}
@GetMapping("/{id}")
@ApiOperation("宸ヨ壓璺嚎璇︽儏")
- public R getInfo(@PathVariable("id") Long id) {
+ public R<TechnologyRoutingVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingService.getTechnologyRoutingInfo(id));
}
@@ -44,9 +47,9 @@
return R.ok(technologyRoutingService.updateById(technologyRouting));
}
- @DeleteMapping("/{ids}")
+ @DeleteMapping("/delete")
@ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
- public R remove(@PathVariable("ids") Long[] ids) {
- return R.ok(technologyRoutingService.removeTechnologyRouting(Arrays.asList(ids)));
+ public R remove(@RequestBody List<Long> ids) {
+ return R.ok(technologyRoutingService.removeTechnologyRouting(ids));
}
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
index 4c73238..c07541c 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyRoutingOperationController.java
@@ -1,14 +1,18 @@
package com.ruoyi.technology.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyRoutingOperationDto;
+import com.ruoyi.technology.bean.vo.TechnologyRoutingOperationVo;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingOperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
@RestController
@RequestMapping("/technologyRoutingOperation")
@@ -20,19 +24,19 @@
@GetMapping("/page")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒嗛〉鏌ヨ")
- public R page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+ public R<IPage<TechnologyRoutingOperationVo>> page(Page<TechnologyRoutingOperationDto> page, TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.pageTechnologyRoutingOperation(page, technologyRoutingOperationDto));
}
@GetMapping("/list")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭鍒楄〃")
- public R list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
+ public R<List<TechnologyRoutingOperationVo>> list(TechnologyRoutingOperationDto technologyRoutingOperationDto) {
return R.ok(technologyRoutingOperationService.listTechnologyRoutingOperation(technologyRoutingOperationDto));
}
@GetMapping("/{id}")
@ApiOperation("宸ヨ壓璺嚎宸ュ簭璇︽儏")
- public R getInfo(@PathVariable("id") Long id) {
+ public R<TechnologyRoutingOperationVo> getInfo(@PathVariable("id") Long id) {
return R.ok(technologyRoutingOperationService.getTechnologyRoutingOperationInfo(id));
}
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
index e112b7d..f94f363 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
@@ -54,11 +55,9 @@
@Override
public Long saveTechnologyRouting(TechnologyRouting technologyRouting) {
+ String code = OrderUtils.countTodayByCreateTime(technologyRoutingMapper, "GYLX", "process_route_code");
+ technologyRouting.setProcessRouteCode(code);
this.save(technologyRouting);
- if (!isNotBlank(technologyRouting.getProcessRouteCode())) {
- technologyRouting.setProcessRouteCode(buildProcessRouteCode(technologyRouting.getId()));
- technologyRoutingMapper.updateById(technologyRouting);
- }
return technologyRouting.getId();
}
--
Gitblit v1.9.3