From 4cb12d21253d754152b7591fe49fa131fed1b3c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:37:28 +0800
Subject: [PATCH] refactor(production): 移除销售台账关联逻辑并优化生产订单创建流程
---
src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
index b642c8f..2f2a90f 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyBomController.java
@@ -6,60 +6,60 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.BomImportDto;
+import com.ruoyi.technology.bean.dto.BomImportDto;
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.pojo.TechnologyBom;
import com.ruoyi.technology.service.TechnologyBomService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/technologyBom")
@RequiredArgsConstructor
-@Api(tags = "鍩虹BOM")
+@Tag(name = "鍩虹BOM")
public class TechnologyBomController {
private final TechnologyBomService technologyBomService;
@GetMapping("/listPage")
@Log(title = "Technology BOM page", businessType = BusinessType.OTHER)
- @ApiOperation("BOM鍒嗛〉鏌ヨ")
+ @Operation(summary = "BOM鍒嗛〉鏌ヨ")
public R<IPage<TechnologyBomVo>> listPage(Page<TechnologyBomDto> page, TechnologyBomDto technologyBomDto) {
return R.ok(technologyBomService.listPage(page, technologyBomDto));
}
@PostMapping("/add")
@Log(title = "Add technology BOM", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板BOM")
+ @Operation(summary = "鏂板BOM")
public R add(@RequestBody TechnologyBom technologyBom) {
return technologyBomService.add(technologyBom);
}
@PutMapping("/update")
@Log(title = "Update technology BOM", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼BOM")
+ @Operation(summary = "淇敼BOM")
public R update(@RequestBody TechnologyBom technologyBom) {
return technologyBomService.update(technologyBom);
}
@DeleteMapping("/batchDelete")
@Log(title = "Delete technology BOM", businessType = BusinessType.DELETE)
- @ApiOperation("鎵归噺鍒犻櫎BOM")
- public R batchDelete(@RequestBody List<Integer> ids) {
+ @Operation(summary = "鎵归噺鍒犻櫎BOM")
+ public R batchDelete(@RequestBody List<Long> ids) {
return R.ok(technologyBomService.batchDelete(ids));
}
@GetMapping("/getByModel")
@Log(title = "List BOM by model", businessType = BusinessType.OTHER)
- @ApiOperation("鏍规嵁瑙勬牸鏌ヨBOM")
+ @Operation(summary = "鏍规嵁瑙勬牸鏌ヨBOM")
public R<List<TechnologyBomVo>> getByModel(Long productModelId) {
return R.ok(technologyBomService.listByModel(productModelId));
}
@@ -67,14 +67,14 @@
@PostMapping("/uploadBom")
@PreAuthorize("@ss.hasPermi('product:bom:import')")
@Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
- @ApiOperation("鏍规嵁Excel瀵煎叆BOM")
+ @Operation(summary = "鏍规嵁Excel瀵煎叆BOM")
public R uploadBom(@RequestParam("file") MultipartFile file) {
return technologyBomService.uploadBom(file);
}
@PostMapping("/exportBom")
@PreAuthorize("@ss.hasPermi('product:bom:export')")
- @ApiOperation("瀵煎嚭BOM鏂囦欢")
+ @Operation(summary = "瀵煎嚭BOM鏂囦欢")
@Log(title = "瀵煎嚭BOM鏂囦欢", businessType = BusinessType.EXPORT)
public void exportBom(HttpServletResponse response, @RequestParam Integer bomId) {
technologyBomService.exportBom(response, bomId);
@@ -82,7 +82,7 @@
@GetMapping("/downloadTemplate")
@Log(title = "涓嬭浇BOM瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
- @ApiOperation("涓嬭浇BOM瀵煎叆妯℃澘")
+ @Operation(summary = "涓嬭浇BOM瀵煎叆妯℃澘")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<BomImportDto> excelUtil = new ExcelUtil<>(BomImportDto.class);
excelUtil.importTemplateExcel(response, "BOM瀵煎叆妯℃澘");
--
Gitblit v1.9.3