From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +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 | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 27758bd..edb0318 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
@@ -6,8 +6,6 @@
import com.example.erp.service.sd.ProductService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Delete;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -27,51 +25,54 @@
@ApiOperation("浜у搧鏌ヨ鎺ュ彛")
@SaCheckPermission("selectProduct.search")
@PostMapping ("/{pageNum}/{pageSize}/{glassType}")
- 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));
+ public Result defaultDateProduct(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> glassType,
+ @RequestBody Map<String,Object> config){
+ return Result.success(productService.defaultDateProduct(pageNum,pageSize,glassType,config));
}
@ApiOperation("鍏朵粬绯荤粺鑾峰彇浜у搧鏌ヨ鎺ュ彛")
@PostMapping("/otherSysGetProduct")
public Result otherSysGetProduct(){
- return Result.seccess(productService.otherSysGetProduct());
+ return Result.success(productService.otherSysGetProduct());
}
@ApiOperation("浜у搧淇濆瓨鎺ュ彛")
@SaCheckPermission("createProduct.add")
- @PostMapping("/saveProduct")
- public Result saveProduct(@RequestBody Map<String,Object> product){
- return Result.seccess(productService.saveProduct(product));
+ @PostMapping("/saveProduct/{operator}")
+ public Result saveProduct(@PathVariable String operator,@RequestBody Map<String,Object> product){
+ return Result.success(productService.saveProduct(product,operator));
}
@ApiOperation("鍏朵粬绯荤粺浜у搧淇濆瓨鎺ュ彛")
@PostMapping("/otherSysSaveProduct")
public Result otherSysSaveProduct(@RequestBody Map<String,Object> product){
- return Result.seccess(productService.saveProduct(product));
+ return Result.success(productService.saveProduct(product,null));
}
@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));
+ return Result.success(productService.selectProduct(productName,product));
}
@ApiOperation("浜у搧鍒犻櫎鎺ュ彛")
@SaCheckPermission("selectProduct.delete")
- @PostMapping("/deleteProductById/{id}")
- public Result deleteProductById(@PathVariable Integer id){
- return Result.seccess(productService.deleteProductById(id));
+ @PostMapping("/deleteProductById/{id}/{operator}")
+ public Result deleteProductById(@PathVariable Integer id,@PathVariable String operator){
+ return Result.success(productService.deleteProductById(id,operator));
}
@ApiOperation("浜у搧瀹℃牳鐘舵�佷慨鏀规帴鍙�")
@SaCheckPermission("createProduct.review")
- @PostMapping("/updateProductStateById/{id}/{state}")
- public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){
- return Result.seccess(productService.updateProductStateById(id,state));
+ @PostMapping("/updateProductStateById/{id}/{state}/{operator}")
+ public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state,@PathVariable String operator){
+ return Result.success(productService.updateProductStateById(id,state,operator));
}
@ApiOperation("鏍规嵁浜у搧id鏌ヨ浜у搧鎺ュ彛")
@SaCheckPermission("selectProduct.edit")
@PostMapping("/selectProductById/{id}")
public Result selectProductById(@PathVariable Integer id){
- return Result.seccess(productService.selectProductById(id));
+ return Result.success(productService.selectProductById(id));
}
}
--
Gitblit v1.8.0