From 131280b87a8a5d171d9e59362fe3d68767548953 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十月 2025 17:03:54 +0800
Subject: [PATCH] 获取IFS订单：添加WG-04-001库位
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 87 +++----------------------------------------
1 files changed, 6 insertions(+), 81 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 327b8f3..499d73b 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,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
+import com.ruoyi.basic.service.*;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.dto.CopyStandardProductListDto;
import com.ruoyi.basic.dto.FactoryDto;
@@ -10,10 +11,6 @@
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;
-import com.ruoyi.basic.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,7 +30,7 @@
private StandardTreeService standardTreeService;
- private StandardMethodListService standardMethodListService;
+ private StandardMethodService standardMethodService;
private StandardProductListService standardProductListService;
@@ -57,18 +54,10 @@
return Result.success(standardTreeService.addStandardTree(standardTree));
}
- @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
- @PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
- Integer standardId = (Integer) map.get("standardId");
- String tree = (String) map.get("tree");
- return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
- }
-
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
- return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
+ return Result.success(standardMethodService.selectsStandardMethodByFLSSM(tree));
}
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@@ -87,27 +76,6 @@
return Result.success(standardProductListService.updateSection(list));
}
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @DeleteMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id) {
- return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
- }
-
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @DeleteMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids) {
- JSONArray lists = JSON.parseArray(ids);
- return Result.success(standardProductListService.delStandardProduct(lists));
- }
-
- @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/addStandardProduct")
- public Result addStandardProduct(@RequestBody Map<String, String> map) {
- String ids = map.get("ids");
- String tree = map.get("tree");
- return Result.success(standardTreeService.addStandardProduct(ids, tree));
- }
-
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
@@ -122,8 +90,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
+ public Result selectStandardProductListByMethodId(Integer id, String tree) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
@@ -141,7 +109,7 @@
@ApiOperation(value = "鑾峰彇鏍囧噯鏍戜笅鏍囧噯鏂规硶鏋氫妇")
@GetMapping("/selectStandardMethodEnum")
public Result selectStandardMethodEnum() {
- return Result.success(standardMethodListService.selectStandardMethodEnum());
+ return Result.success(standardMethodService.selectStandardMethodEnum());
}
@ApiOperation(value = "鑾峰彇浜у搧鏋舵瀯")
@@ -160,49 +128,6 @@
return Result.success(standardTreeService.upStandardProducts(product));
}
- @ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
- @GetMapping("/getStandTreeBySampleType")
- public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
- return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
- }
-
- @ApiOperation("瀵煎叆鏍囧噯搴�")
- @PostMapping("/inExcelOfTree/{isEquipment}")
- public Result inExcelOfTree(@RequestParam("file") MultipartFile file, @PathVariable("isEquipment") Boolean isEquipment) {
- if (!isEquipment) {
- standardTreeService.inExcelOfTree(file);
- } else {
- standardTreeService.importWorkstationExcel(file);
- }
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
- @PostMapping("/resetTreeOfPrice")
- public Result resetTreeOfPrice(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfPrice(tree, standardId);
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�")
- @PostMapping("/resetTreeOfHour")
- public Result resetTreeOfHour(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfHour(tree, standardId);
- return Result.success();
- }
-
- @ApiOperation("閲嶇疆鏍囧噯搴撹姹傛弿杩板拰瑕佹眰鍊�")
- @PostMapping("/resetTreeOfAsk")
- public Result resetTreeOfAsk(@RequestBody Map<String, Object> map) {
- String tree = (String) map.get("tree");
- Integer standardId = (Integer) map.get("standardId");
- standardTreeService.resetTreeOfAsk(tree, standardId);
- return Result.success();
- }
@ApiOperation("鏍囧噯搴撴嫋鎷�")
@PostMapping("/resetTreeDrag")
--
Gitblit v1.9.3