From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
index 431e698..27758bd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -30,12 +30,31 @@
public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product));
}
+ @ApiOperation("鍏朵粬绯荤粺鑾峰彇浜у搧鏌ヨ鎺ュ彛")
+ @PostMapping("/otherSysGetProduct")
+ public Result otherSysGetProduct(){
+ return Result.seccess(productService.otherSysGetProduct());
+ }
+
@ApiOperation("浜у搧淇濆瓨鎺ュ彛")
- @SaCheckPermission("selectProduct.add")
+ @SaCheckPermission("createProduct.add")
@PostMapping("/saveProduct")
public Result saveProduct(@RequestBody Map<String,Object> product){
return Result.seccess(productService.saveProduct(product));
}
+ @ApiOperation("鍏朵粬绯荤粺浜у搧淇濆瓨鎺ュ彛")
+ @PostMapping("/otherSysSaveProduct")
+ public Result otherSysSaveProduct(@RequestBody Map<String,Object> product){
+ return Result.seccess(productService.saveProduct(product));
+ }
+
+ @ApiOperation("浜у搧鏌ラ噸鎺ュ彛")
+ @SaCheckPermission("createProduct.add")
+ @PostMapping("/selectProduct/{productName}")
+ public Result selectProduct(@PathVariable String productName,@RequestBody Map<String,Object> product){
+ return Result.seccess(productService.selectProduct(productName,product));
+ }
+
@ApiOperation("浜у搧鍒犻櫎鎺ュ彛")
@SaCheckPermission("selectProduct.delete")
@PostMapping("/deleteProductById/{id}")
@@ -44,7 +63,7 @@
}
@ApiOperation("浜у搧瀹℃牳鐘舵�佷慨鏀规帴鍙�")
- @SaCheckPermission("selectProduct.review")
+ @SaCheckPermission("createProduct.review")
@PostMapping("/updateProductStateById/{id}/{state}")
public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){
return Result.seccess(productService.updateProductStateById(id,state));
--
Gitblit v1.8.0