From e595c86c223563a178b9bb0d0dcb8b0c3c3771c0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 16:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/controller/ProcessRouteController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
index c01d836..31ff3fb 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteController.java
@@ -1,9 +1,12 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProcessRouteDto;
import com.ruoyi.production.pojo.ProcessRoute;
+import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.service.ProcessRouteItemService;
import com.ruoyi.production.service.ProcessRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -20,6 +23,9 @@
@Autowired
private ProcessRouteService processRouteService;
+ @Autowired
+ private ProcessRouteItemService processRouteItemService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉鏌ヨ")
public R page(Page<ProcessRouteDto> page, ProcessRouteDto processRouteDto) {
@@ -29,7 +35,7 @@
@ApiOperation("鏂板宸ヨ壓璺嚎")
@PostMapping ()
public R add(@RequestBody ProcessRoute processRoute) {
- return R.ok(processRouteService.save(processRoute));
+ return R.ok(processRouteService.saveProcessRoute(processRoute));
}
@ApiOperation("淇敼宸ヨ壓璺嚎")
@PutMapping ()
@@ -39,6 +45,8 @@
@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)));
}
}
--
Gitblit v1.9.3