From 08004029f1fb93d5a433c55a53109b2d11caf96a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 09:32:14 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 3927844..1df9b55 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
@@ -2,11 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.pojo.*;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
@@ -112,7 +111,7 @@
return Result.success(standardMethodListService.selectStandardMethodEnum());
}
- @ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灦鏋勬爲")
@GetMapping("/getStandardTree2")
public Result getStandardTree2() {
return Result.success(standardTreeService.getStandardTree2());
@@ -225,10 +224,10 @@
return Result.success();
}
- @ApiOperation(value = "淇敼鏍囧噯鏍�")
+ @ApiOperation(value = "淇敼鍨嬪彿")
@PostMapping("/updateStandardTree")
- public Result updateStandardTree(@RequestBody StandardTree standardTree) {
- return Result.success(standardTreeService.updateStandardTree(standardTree));
+ public Result updateStandardTree(@RequestBody ModelAddDto modelAddDto) {
+ return Result.success(standardTreeService.updateStandardTree(modelAddDto));
}
@ApiOperation(value = "妫�楠岄」瑕佹眰鍊煎鍒跺姣�")
@@ -255,4 +254,18 @@
public Result copyStandardProductSort(@RequestBody CopyStandardProductListDto copyStandardProductListDto) {
return Result.success(standardProductListService.copyStandardProductSort(copyStandardProductListDto));
}
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」鎻愪氦")
+ @PostMapping("/productListSubmit")
+ public Result productListSubmit(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListSubmit(standardProductListUpdateRecord);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏍囧噯鏍戜笅妫�楠岄」瀹℃牳")
+ @PostMapping("/productListCheck")
+ public Result productListCheck(@RequestBody StandardProductListUpdateRecord standardProductListUpdateRecord) {
+ standardProductListService.productListCheck(standardProductListUpdateRecord);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3