From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
index 787be26..f93d94e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -1,10 +1,13 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.ProductionScheduling;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.ProductionSchedulingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -12,51 +15,52 @@
import java.util.Map;
@RestController
+@Api(value="鎺掍骇controller",tags={"鎺掍骇鐩稿叧鎿嶄綔鎺ュ彛"})
@RequestMapping("/productionScheduling")
public class ProductionSchedulingController {
@Autowired
ProductionSchedulingService productionSchedulingService;
//鏌ヨ绗竴娆℃帓鐗堟暟鎹�
- @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ @ApiOperation("鍔犺浇鏃舵煡璇㈡帓鐗堟暟鎹帴鍙�")
+ @SaCheckPermission("productionScheduling.search")
+ @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
public Result selectLastScheduling(
@PathVariable String selectTime1,
@PathVariable String selectTime2,
+ @PathVariable String processes,
+ @PathVariable String orderId,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,productionScheduling));
+ return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
- @PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result SelectScheduling(
+ @ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
+ @SaCheckPermission("productionScheduling.search")
+ @PostMapping ("/selectScheduling/{pageNum}/{pageSize}/{selectTime1}/{selectTime2}/{orderIds}/{processes}/{state}")
+ public Result selectScheduling(
+ @PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
@PathVariable String selectTime1,
@PathVariable String selectTime2,
- @PathVariable String orderId,
+ @PathVariable String orderIds,
@PathVariable String processes,
@PathVariable Integer state,
@RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.SelectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+
+ return Result.seccess(productionSchedulingService.selectSchedulingSv(pageNum, pageSize,selectTime1,selectTime2,orderIds,processes,state,productionScheduling));
}
- //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
- @PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
- public Result selectSchedulingNot(
- @PathVariable String selectTime1,
- @PathVariable String selectTime2,
- @PathVariable String orderId,
- @PathVariable String processes,
- @PathVariable Integer state,
- @RequestBody ProductionScheduling productionScheduling){
- return Result.seccess(productionSchedulingService.selectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
- }
//娣诲姞鎺掍骇鏁版嵁
+ @ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("productionScheduling.add")
@PostMapping("/addScheduling")
- public Result AddScheduling( @RequestBody Map<String,Object> object){
+ public Result addScheduling( @RequestBody Map<String,Object> object){
- if(productionSchedulingService.AddSchedulingSv(object)){
+ if(productionSchedulingService.addSchedulingSv(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -65,6 +69,8 @@
}
//鍒犻櫎鎺掍骇鏁版嵁
+ @ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("productionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
@@ -76,10 +82,12 @@
}
}
+ @ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
+ @SaCheckPermission("productionScheduling.review")
@PostMapping("/examineScheduling")
- public Result ExamineScheduling( @RequestBody Map<String,Object> object){
+ public Result examineScheduling( @RequestBody Map<String,Object> object){
- if(productionSchedulingService.ExamineSchedulingSv(object)){
+ if(productionSchedulingService.examineSchedulingSv(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
@@ -87,4 +95,17 @@
}
}
+ @ApiOperation("鎺掔増鍙嶅鎺ュ彛")
+ @SaCheckPermission("productionScheduling.review")
+ @PostMapping("/cancelReviewScheduling")
+ public Result cancelReviewScheduling( @RequestBody Map<String,Object> object){
+
+ if(productionSchedulingService.cancelReviewSchedulingSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍙嶅澶辫触");
+
+ }
+ }
+
}
--
Gitblit v1.8.0