From 19effb2444eaf331f61fd0d43d3735f8d1baf768 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:14:44 +0800
Subject: [PATCH] fix: BOM的子集取消第一层限制
---
src/main/java/com/ruoyi/production/controller/ProductBomController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductBomController.java b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
index 0ad7d59..dee173d 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductBomController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductBomController.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,7 +58,7 @@
@GetMapping("/listPage")
@Log(title = "BOM-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("BOM-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, ProductBomDto productBomDto) {
+ public AjaxResult listPage(Page<ProductBom> page, ProductBomDto productBomDto) {
IPage<ProductBomDto> listPage = productBomService.listPage(page, productBomDto);
return AjaxResult.success(listPage);
}
@@ -101,13 +102,21 @@
return AjaxResult.success(productBoms);
}
+ @GetMapping("/getDictCode")
+ @Log(title = "BOM-鏍规嵁閫夋嫨鐨勪骇鍝佸瀷鍙锋煡璇㈠瓨鍦ㄧ殑bom", businessType = BusinessType.OTHER)
+ @ApiOperation("BOM-鏍规嵁閫夋嫨鐨勪骇鍝佸瀷鍙锋煡璇㈠瓨鍦ㄧ殑bom")
+ public AjaxResult getDictCode(Long dictCode) {
+ List<ProductBom> bomList = productBomService.list(new LambdaQueryWrapper<ProductBom>().eq(ProductBom::getDictCode, dictCode));
+ return AjaxResult.success(bomList);
+ }
+
@PostMapping("uploadBom")
@PreAuthorize("@ss.hasPermi('product:bom:import')")
@Log(title = "鏍规嵁Excel瀵煎叆BOM", businessType = BusinessType.IMPORT)
@ApiOperation("鏍规嵁Excel瀵煎叆BOM")
- public AjaxResult uploadBom(@RequestParam("file") MultipartFile file) {
- return productBomService.uploadBom(file);
+ public AjaxResult uploadBom(@RequestParam("file") MultipartFile file, @RequestParam("dictCode") Long dictCode) {
+ return productBomService.uploadBom(file, dictCode);
}
@PostMapping("exportBom")
--
Gitblit v1.9.3