From 6f287ccb0f8df857fbce894bd241cdf77690cecb Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 15:23:11 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
index 62d5fa9..9f6c628 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -1,47 +1,30 @@
package com.ruoyi.production.controller;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductStructureDto;
-import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductStructureService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-
@RequestMapping("productStructure")
@RestController
-@Api(tags = "浜у搧缁撴瀯")
+@Api(tags = "BOM")
public class ProductStructureController {
@Autowired
private ProductStructureService productStructureService;
- @ApiOperation("鏍规嵁productId鏌ヨ")
- @GetMapping("listByProductId")
- public R listByProductId( Long productId){
- return R.ok(productStructureService.listByProductId( productId));
- }
-
- @ApiOperation("鏂板浜у搧缁撴瀯")
+ @ApiOperation("鏂板BOM")
@PostMapping()
- public R add(ProductStructure productStructure){
- return R.ok(productStructureService.save(productStructure));
+ public R addOrUpdate(@RequestBody ProductStructureDto productStructureDto){
+ return R.ok(productStructureService.addProductStructureDto(productStructureDto));
}
- @ApiOperation("淇敼浜у搧缁撴瀯")
- @PutMapping()
- public R update(ProductStructure productStructure){
- return R.ok(productStructureService.updateById(productStructure));
- }
-
- @ApiOperation("鍒犻櫎浜у搧缁撴瀯")
- @DeleteMapping("/{ids}")
- public R delete(@PathVariable("ids") Long[] ids){
- return R.ok(productStructureService.removeBatchByIds(Arrays.asList(ids)));
+ @ApiOperation("BOM鏌ョ湅璇︽儏")
+ @GetMapping("/listBybomId/{bomId}")
+ public R listBybomId( @PathVariable("bomId") Long bomId){
+ return R.ok(productStructureService.listBybomId(bomId));
}
}
--
Gitblit v1.9.3