From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 499d73b..70ea6a1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -4,13 +4,15 @@
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.basic.service.*;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.basic.dto.AddStandardTreeNodeDto;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
import com.ruoyi.basic.dto.InsSampleReceiveDto;
import com.ruoyi.basic.dto.ResetTreeDragDTO;
+import com.ruoyi.basic.dto.StandardLibraryTreeNodeDto;
+import com.ruoyi.basic.dto.UpdateStandardTreeNodeDto;
+import com.ruoyi.basic.dto.StandardTreeTemplateBindingDto;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -50,13 +52,16 @@
@ApiOperation(value = "娣诲姞鏍囧噯鏍�")
@PostMapping("/addStandardTree")
- public Result addStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.addStandardTree(standardTree));
+ public Result addStandardTree(@RequestBody AddStandardTreeNodeDto dto) {
+ return Result.success(standardTreeService.addStandardTree(dto));
}
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
+ if (tree == null || tree.trim().isEmpty()) {
+ return Result.fail("鏍囧噯鏍戝弬鏁颁笉鑳戒负绌�");
+ }
return Result.success(standardMethodService.selectsStandardMethodByFLSSM(tree));
}
@@ -90,8 +95,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
+ public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page, String keyword) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page, keyword));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
@@ -146,7 +151,7 @@
@ApiOperation(value = "鏍囧噯鏍戞帓搴�")
@PostMapping("/updateTreeSort")
- public Result updateTreeSort(@RequestBody List<FactoryDto> list) {
+ public Result updateTreeSort(@RequestBody List<StandardLibraryTreeNodeDto> list) {
return Result.success(standardTreeService.updateTreeSort(list));
}
@@ -184,8 +189,20 @@
@ApiOperation(value = "淇敼鏍囧噯鏍�")
@PostMapping("/updateStandardTree")
- public Result updateStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.updateStandardTree(standardTree));
+ public Result updateStandardTree(@RequestBody UpdateStandardTreeNodeDto dto) {
+ return Result.success(standardTreeService.updateStandardTree(dto));
+ }
+
+ @ApiOperation(value = "鏌ヨ鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
+ @GetMapping("/selectTemplateBindings")
+ public Result selectTemplateBindings(Integer standardTreeId) {
+ return Result.success(standardTreeService.selectTemplateBindings(standardTreeId));
+ }
+
+ @ApiOperation(value = "淇濆瓨鏍囧噯缁戝畾鐨勫師濮嬭褰曟ā鏉�")
+ @PostMapping("/saveTemplateBindings")
+ public Result saveTemplateBindings(@RequestBody StandardTreeTemplateBindingDto dto) {
+ return Result.success(standardTreeService.saveTemplateBindings(dto));
}
@ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎鍒跺姣�")
--
Gitblit v1.9.3