From aa7bcbc678a671a51a87c7ba6bbfaa107399a96d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 四月 2025 14:28:16 +0800
Subject: [PATCH] 添加优化原片出库报表，除去时间相关筛选
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..9c108f4 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,15 +25,37 @@
@ApiOperation("浜у搧鏌ヨ鎺ュ彛")
@SaCheckPermission("selectProduct.search")
@PostMapping ("/{pageNum}/{pageSize}/{glassType}")
- public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){
+ 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 +64,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