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/MaterialController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
index 1d833ab..255c998 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
@@ -39,11 +39,20 @@
return Result.success(materialService.selectTreeByMaterial());
}
+ @ApiOperation(value = "鏂板-->閫夋嫨浜у搧澶х被")
+ @GetMapping("/chooseFather")
+ public Result chooseFather() {
+ return Result.success(materialService.chooseFather());
+ }
+
@ApiOperation("(1,2绾�)鏂板-->鐗╂枡,鏍囧噯,鍨嬪彿")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "spId", value = "澶嶅埗閫夋嫨鐨勫瀷鍙穒d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "ver", value = "澶嶅埗閫夋嫨鐨勭増鏈�", dataTypeClass = Integer.class)
+ })
@PostMapping("/add")
- public Result<?> addMaterial(@Validated @RequestBody MaterialDto materialDto) {
- materialService.addMaterial(materialDto);
- return Result.success("娣诲姞鐗╂枡銆�" + materialDto.getName() + "銆戞垚鍔�");
+ public Result<?> addMaterial(@Validated @RequestBody MaterialDto materialDto,Integer spId,Integer ver) {
+ return Result.success(materialService.addMaterial(materialDto,spId,ver));
}
@ApiOperation(value = "鍙充晶鏁版嵁灞曠ず-->閫夋嫨鐗堟湰")
@@ -95,4 +104,16 @@
}
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 = materialService.addVersion(specificationsId,version);
+ return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勭増鏈�"+version1+"鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3