From 86adbb1544142dcfb48333dade822f81640607a6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 78 insertions(+), 13 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 30ac074..1d833ab 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
@@ -1,22 +1,19 @@
package com.yuanchu.mom.controller;
-import com.yuanchu.mom.pojo.dto.MaterialTreeDto;
-import com.yuanchu.mom.service.MaterialService;
+import com.yuanchu.mom.pojo.dto.MaterialDto;
+import com.yuanchu.mom.service.*;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.Resource;
-@Api(tags = "鎶�鏈鐞�-->鏍囧噯MOM-->鐗╂枡妯″潡")
+@Api(tags = "鎶�鏈鐞�-->鏍囧噯BOM")
@RestController
@RequestMapping("/material")
public class MaterialController {
@@ -24,10 +21,78 @@
@Autowired
private MaterialService materialService;
- @ApiOperation(value = "鏌ヨ鐗╂枡鐨勬爲")
+ @Resource
+ TechnologyService technologyService;
+
+ @Resource
+ ProductService productService;
+
+ @Resource
+ MbomService mbomService;
+
+ @Resource
+ TechniqueService techniqueService;
+
+ @ApiOperation(value = "宸︿晶浜旂骇鏍戝睍绀�")
@GetMapping("/selectTreeByMaterial")
- public Result<List<MaterialTreeDto>> selectTreeByMaterial(){
+ public Result selectTreeByMaterial() {
return Result.success(materialService.selectTreeByMaterial());
}
+ @ApiOperation("(1,2绾�)鏂板-->鐗╂枡,鏍囧噯,鍨嬪彿")
+ @PostMapping("/add")
+ public Result<?> addMaterial(@Validated @RequestBody MaterialDto materialDto) {
+ materialService.addMaterial(materialDto);
+ return Result.success("娣诲姞鐗╂枡銆�" + materialDto.getName() + "銆戞垚鍔�");
+ }
+
+ @ApiOperation(value = "鍙充晶鏁版嵁灞曠ず-->閫夋嫨鐗堟湰")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(0:宸ヨ壓璺嚎;1:鎶�鏈寚鏍�;2:鐗╂枡娓呭崟;3:鐢熶骇宸ヨ壓)", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectVersion")
+ public Result selectVersion(Integer type, Integer specificationsId) {
+ switch (type) {
+ case 0:
+ //宸ヨ壓璺嚎
+ return Result.success(technologyService.selectVerByTec(specificationsId));
+ case 1:
+ //鎶�鏈寚鏍�
+ return Result.success(productService.selectVerByPro(specificationsId));
+ case 2:
+ //鐗╂枡娓呭崟
+ return Result.success(mbomService.selectVerByMbom(specificationsId));
+ case 3:
+ //鐢熶骇宸ヨ壓
+ return Result.success(techniqueService.selectVerByTeq(specificationsId));
+ }
+ return Result.fail("娌℃湁璇ョ被鍨�!");
+ }
+
+ @ApiOperation(value = "鍙充晶鏁版嵁灞曠ず")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(0:宸ヨ壓璺嚎;1:鎶�鏈寚鏍�;2:鐗╂枡娓呭崟;3:鐢熶骇宸ヨ壓)", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂�)", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "message", value = "鎼滅储鍐呭", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectAll")
+ public Result selectAll(Integer specificationsId, Integer type, Integer version,String message) {
+ switch (type) {
+ case 0:
+ //宸ヨ壓璺嚎
+ return Result.success(technologyService.selectAllTec(specificationsId, version,message));
+ case 1:
+ //鎶�鏈寚鏍�
+ return Result.success(productService.selectAllPro(specificationsId, version,message));
+ case 2:
+ //鐗╂枡娓呭崟
+ return Result.success(mbomService.selectAllMbom(specificationsId, version,message));
+ case 3:
+ //鐢熶骇宸ヨ壓
+ return Result.success(techniqueService.selectAllTeq(specificationsId, version,message));
+ }
+ return Result.fail("娌℃湁璇ョ被鍨�!");
+ }
}
--
Gitblit v1.9.3