From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
index a13dbd9..abbe0b8 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
@@ -30,22 +30,20 @@
@ApiOperation("鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟-->閫夋嫨宸ュ簭,宸ヨ壓")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/chooseTech")
- public Result<?> chooseTech(Integer specificationsId) {
- return Result.success(mbomService.chooseTech(specificationsId));
+ public Result<?> chooseTech(Integer specificationsId,Integer version) {
+ return Result.success(mbomService.chooseTech(specificationsId,version));
}
@ApiOperation("鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "technologyId", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
- })
@PostMapping("/add")
- public Result<?> addMbom(Integer technologyId, @Validated @RequestBody MbomDto mbomDto) {
- mbomService.addMbom(technologyId, mbomDto);
- return Result.success("娣诲姞鐗╂枡娓呭崟銆�" + mbomDto.getName() + "銆戞垚鍔�");
+ public Result<?> addMbom(@Validated @RequestBody MbomDto mbomDto) {
+ mbomService.addMbom( mbomDto);
+ return Result.success("娣诲姞鐗╂枡娓呭崟鎴愬姛");
}
@ApiOperation("濉啓鏁伴噺,榧犳爣绉诲紑淇濆瓨")
@@ -61,17 +59,6 @@
return Result.success("鏇存柊鎴愬姛");
}
return Result.fail("鏇存柊澶辫触");
- }
-
- @ApiOperation("娣诲姞鍚屼竴涓瀷鍙风墿鏂欐竻鍗曠殑鐗堟湰")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/addVersion")
- public Result<?> addVersion(Integer specificationsId ,Integer version) {
- Integer version1 = mbomService.addVersion(specificationsId,version);
- return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勭墿鏂欐竻鍗曠増鏈�"+version1+"鎴愬姛");
}
@ApiOperation(value = "鍒犻櫎")
--
Gitblit v1.9.3