From a383e7dbc619cdb468979d4863349c43550a9af2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 四月 2026 11:33:13 +0800
Subject: [PATCH] feat(production): 扩展生产工艺路线支持多产品绑定及工单权限控制
---
src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 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 4fec36e..b9040de 100644
--- a/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProcessRouteItemController.java
@@ -1,7 +1,8 @@
package com.ruoyi.production.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.ProcessRouteItem;
@@ -9,15 +10,18 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("processRouteItem")
@Api(tags = "宸ヨ壓璺嚎鏄庣粏")
public class ProcessRouteItemController {
+
@Autowired
private ProcessRouteItemService processRouteItemService;
@@ -26,11 +30,50 @@
return R.ok(processRouteItemService.listProcessRouteItemDto(processRouteItemDto));
}
-
- @PostMapping ()
+ @PostMapping
@ApiOperation("鏂板淇敼")
- public R addOrUpdate(@RequestBody ProcessRouteItemDto processRouteItemDto) {
- processRouteItemService.remove(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRouteItemDto.getRouteId()));
- return R.ok(processRouteItemService.saveBatch(processRouteItemDto.getProcessRouteItem()));
+ public R addOrUpdate(@RequestBody ProcessRouteItem processRouteItem) {
+ normalizeProductBinding(processRouteItem);
+ return R.ok(processRouteItemService.saveOrUpdate(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));
+ }
+
+ private void normalizeProductBinding(ProcessRouteItem processRouteItem) {
+ if (processRouteItem == null) {
+ return;
+ }
+ String ids = null;
+ List<Long> idList = processRouteItem.getProductModelIdList();
+ if (idList != null && !idList.isEmpty()) {
+ ids = idList.stream()
+ .filter(item -> item != null && item > 0)
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ } else if (StringUtils.hasText(processRouteItem.getProductModelIds())) {
+ ids = Arrays.stream(processRouteItem.getProductModelIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::hasText)
+ .distinct()
+ .collect(Collectors.joining(","));
+ } else if (processRouteItem.getProductModelId() != null) {
+ ids = String.valueOf(processRouteItem.getProductModelId());
+ }
+ processRouteItem.setProductModelIds(ids);
+ if (StringUtils.hasText(ids)) {
+ processRouteItem.setProductModelId(Long.valueOf(ids.split(",")[0]));
+ }
}
}
--
Gitblit v1.9.3