From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 22 +++++-----------------
1 files changed, 5 insertions(+), 17 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..26594f6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductStructureController.java
@@ -22,26 +22,14 @@
@ApiOperation("鏍规嵁productId鏌ヨ")
- @GetMapping("listByProductId")
- public R listByProductId( Long productId){
- return R.ok(productStructureService.listByProductId( productId));
+ @GetMapping("/listByproductModelId/{productModelId}")
+ public R listByproductModelId( @PathVariable("productModelId") Long productModelId){
+ return R.ok(productStructureService.listByproductModelId( productModelId));
}
@ApiOperation("鏂板浜у搧缁撴瀯")
@PostMapping()
- public R add(ProductStructure productStructure){
- return R.ok(productStructureService.save(productStructure));
- }
-
- @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)));
+ public R addOrUpdate(@RequestBody ProductStructureDto productStructureDto){
+ return R.ok(productStructureService.addProductStructureDto(productStructureDto));
}
}
--
Gitblit v1.9.3