From d34aa4f61a58b1833eaeda5e3abbb553578c6bcc Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:19:27 +0800
Subject: [PATCH] 车间管理模块，产品车间绑定
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 73 ++++++++++++++----------------------
1 files changed, 29 insertions(+), 44 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 d24ae09..45851ec 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
@@ -57,53 +57,30 @@
return Result.success(standardTreeService.addStandardTree(standardTree));
}
- @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
- @PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(String tree, Integer standardId) {
- return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
- }
-
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
- @PostMapping("/selectsStandardMethodByFLSSM")
+ @GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
return Result.success(standardMethodListService.selectsStandardMethodByFLSSM(tree));
}
@ApiOperation(value = "淇敼鏍囧噯搴撲腑鐨勫唴瀹�")
@PostMapping("/upStandardProductList")
- public Result upStandardProductList(String str) {
+ public Result upStandardProductList(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.upStandardProductList(list));
}
@ApiOperation(value = "淇敼鏍囧噯搴撳尯闂�")
@PostMapping("/updateSection")
- public Result updateSection(String str) {
+ public Result updateSection(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductList list = JSON.parseObject(str, StandardProductList.class);
return Result.success(standardProductListService.updateSection(list));
}
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @PostMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id) {
- return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
- }
-
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids) {
- JSONArray lists = JSON.parseArray(ids);
- return Result.success(standardProductListService.delStandardProduct(lists));
- }
-
- @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/addStandardProduct")
- public Result addStandardProduct(String ids, String tree) {
- return Result.success(standardTreeService.addStandardProduct(ids, tree));
- }
-
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
- @PostMapping("/delStandardTree")
+ @DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
return Result.success(standardTreeService.delStandardTree(tree));
}
@@ -115,19 +92,19 @@
}
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
- @PostMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
+ @GetMapping("/selectStandardProductListByMethodId")
+ public Result selectStandardProductListByMethodId(Integer id, String tree) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
}
- @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ妫�楠岄」鐩�")
- @PostMapping("/selectStandardProductByMethodId")
+ @ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
+ @GetMapping("/selectStandardProductByMethodId")
public Result selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items) {
return Result.success(standardProductListService.selectStandardProductByMethodId(id, tree, page, laboratory, item, items));
}
- @ApiOperation(value = "鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
- @PostMapping("/selectStandardProductEnumByMethodId")
+ @ApiOperation(value = "鎵归噺鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�")
+ @GetMapping("/selectStandardProductEnumByMethodId")
public Result selectStandardProductEnumByMethodId(Integer id, String tree, String item) {
return Result.success(standardProductListService.selectStandardProductEnumByMethodId(id, tree, item));
}
@@ -154,8 +131,8 @@
return Result.success(standardTreeService.upStandardProducts(product));
}
- @PostMapping("/getStandTreeBySampleType")
@ApiOperation("浠呰幏鍙栧厜绾ょ殑鍨嬪彿")
+ @GetMapping("/getStandTreeBySampleType")
public Result<?> getStandTreeBySampleType(String laboratory, String sampleType) {
return Result.success(standardTreeService.getStandTreeBySampleType(laboratory, sampleType));
}
@@ -173,21 +150,27 @@
@ApiOperation("閲嶇疆鏍囧噯搴撳崟浠�")
@PostMapping("/resetTreeOfPrice")
- public Result resetTreeOfPrice(String tree, Integer standardId) {
+ 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(String tree, Integer standardId) {
+ 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(String tree, Integer standardId) {
+ 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();
}
@@ -217,27 +200,29 @@
@ApiOperation(value = "鏍规嵁浜у搧id鏌ヨ鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/selectSupplierAsk")
- public Result selectSupplierAsk(StandardProductListSupplierAsk supplierAsk) throws Exception {
+ public Result selectSupplierAsk(@RequestBody StandardProductListSupplierAsk supplierAsk) throws Exception {
return Result.success(standardProductListSupplierAskService.selectByProductId(supplierAsk));
}
@ApiOperation(value = "鏂板鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/addProductSupplierAsk")
- public Result addProductSupplierAsk(String str) {
+ public Result addProductSupplierAsk(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
return Result.success(standardProductListSupplierAskService.addProductSupplierAsk(supplierAsk));
}
@ApiOperation(value = "鏇存柊鍘傚瑕佹眰鍊肩粦瀹�")
@PostMapping("/updateProductSupplierAsk")
- public Result updateProductSupplierAsk(String str) {
+ public Result updateProductSupplierAsk(@RequestBody Map<String, String> map) {
+ String str = map.get("str");
StandardProductListSupplierAsk supplierAsk = JSON.parseObject(str, StandardProductListSupplierAsk.class);
standardProductListSupplierAskService.updateProductSupplierAsk(supplierAsk);
return Result.success();
}
@ApiOperation(value = "鍒犻櫎鍘傚瑕佹眰鍊肩粦瀹�")
- @PostMapping("/deleteProductSupplierAsk")
+ @DeleteMapping("/deleteProductSupplierAsk")
public Result deleteProductSupplierAsk(Integer supplierAskId) {
standardProductListSupplierAskService.removeById(supplierAskId);
return Result.success();
--
Gitblit v1.9.3