From 78286a5422d2180df5cd66a85570a7a3cd2f4d71 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:36:21 +0800
Subject: [PATCH] fix: 新增工艺路线与子集去除绑定产品,改为工序与产品类型
---
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
index 31ff3fb..5567696 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteDto;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.service.ProcessRouteItemService;
@@ -14,39 +16,44 @@
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
@RestController
-@RequestMapping("processRoute")
+@RequestMapping("/processRoute")
@Api(tags = "宸ヨ壓璺嚎")
public class ProcessRouteController {
@Autowired
private ProcessRouteService processRouteService;
- @Autowired
- private ProcessRouteItemService processRouteItemService;
-
- @GetMapping("page")
+ @GetMapping("/page")
@ApiOperation("鍒嗛〉鏌ヨ")
- public R page(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
+ public R page(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
return R.ok(processRouteService.pageProcessRouteDto(page, processRouteDto));
}
@ApiOperation("鏂板宸ヨ壓璺嚎")
- @PostMapping ()
- public R add(@RequestBody ProcessRoute processRoute) {
+ @PostMapping("")
+ public R add(@RequestBody ProcessRoute processRoute) {
return R.ok(processRouteService.saveProcessRoute(processRoute));
}
+
@ApiOperation("淇敼宸ヨ壓璺嚎")
- @PutMapping ()
- public R update(@RequestBody ProcessRoute processRoute) {
+ @PutMapping("")
+ public R update(@RequestBody ProcessRoute processRoute) {
return R.ok(processRouteService.updateById(processRoute));
}
+
@ApiOperation("鍒犻櫎宸ヨ壓璺嚎")
@DeleteMapping("/{ids}")
public R delete(@PathVariable("ids") Long[] ids) {
- //鍒犻櫎宸ヨ壓璺嚎璇︽儏
- processRouteItemService.remove(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getRouteId,Arrays.asList(ids)));
- return R.ok(processRouteService.removeBatchByIds(Arrays.asList(ids)));
+ return R.ok(processRouteService.batchDelete(Arrays.asList(ids)));
+ }
+
+ @GetMapping("/getRouteBom/{id}")
+ @ApiOperation("鑾峰彇宸ヨ壓璺嚎缁戝畾鐨凚OM瀛愰泦")
+ public AjaxResult getRouteBom(@PathVariable Long id) {
+ List<ProductStructureDto> list = processRouteService.getRouteBom(id);
+ return AjaxResult.success(list);
}
}
--
Gitblit v1.9.3