From f5624a59380db70633eebe3612e2d3c703012b41 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 17:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/production/controller/ProductStructureController.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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..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("listByproductModelId")
- public R listByproductModelId( Long productModelId){
+ @GetMapping("/listByproductModelId/{productModelId}")
+ public R listByproductModelId( @PathVariable("productModelId") Long productModelId){
return R.ok(productStructureService.listByproductModelId( productModelId));
}
@ApiOperation("鏂板浜у搧缁撴瀯")
@PostMapping()
- public R add(@RequestBody ProductStructure productStructure){
- return R.ok(productStructureService.save(productStructure));
- }
-
- @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)));
+ public R addOrUpdate(@RequestBody ProductStructureDto productStructureDto){
+ return R.ok(productStructureService.addProductStructureDto(productStructureDto));
}
}
--
Gitblit v1.9.3