From 17a7110753d9efeeaca28d7869fec4d084fc2d46 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 16 一月 2026 17:19:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
index a2ea47e..2f99a00 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -1,7 +1,12 @@
package com.ruoyi.production.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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.ProductProcessDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProductStructureService;
@@ -15,33 +20,21 @@
@RequestMapping("productStructure")
@RestController
-@Api(tags = "浜у搧缁撴瀯")
+@Api(tags = "BOM")
public class ProductStructureController {
@Autowired
private ProductStructureService productStructureService;
- @ApiOperation("鏍规嵁productId鏌ヨ")
- @GetMapping("listByproductModelId")
- public R listByproductModelId( Long productModelId){
- return R.ok(productStructureService.listByproductModelId( productModelId));
- }
-
- @ApiOperation("鏂板浜у搧缁撴瀯")
+ @ApiOperation("鏂板BOM")
@PostMapping()
- public R add(@RequestBody 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(@RequestBody 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