From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 2e8bd1d..6b54924 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,5 +1,6 @@
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;
@@ -22,16 +23,20 @@
//鏌ヨ绗竴娆℃帓鐗堟暟鎹�
@ApiOperation("鍔犺浇鏃舵煡璇㈡帓鐗堟暟鎹帴鍙�")
- @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ @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));
}
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
@ApiOperation("鐐瑰嚮鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.search")
@PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
public Result selectScheduling(
@PathVariable String selectTime1,
@@ -46,6 +51,7 @@
//鐐瑰嚮鏌ヨ鎺掔増鏁版嵁锛堝甫璁㈠崟鍙锋煡璇級
@ApiOperation("鏍规嵁鏉′欢鏌ヨ鎺掔増鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.search")
@PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
public Result selectSchedulingNot(
@PathVariable String selectTime1,
@@ -60,6 +66,7 @@
//娣诲姞鎺掍骇鏁版嵁
@ApiOperation("娣诲姞鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.add")
@PostMapping("/addScheduling")
public Result addScheduling( @RequestBody Map<String,Object> object){
@@ -73,6 +80,7 @@
//鍒犻櫎鎺掍骇鏁版嵁
@ApiOperation("鍒犻櫎鎺掍骇鏁版嵁鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.delete")
@PostMapping("/deleteScheduling")
public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{
@@ -85,6 +93,7 @@
}
@ApiOperation("鎺掔増瀹℃牳鎺ュ彛")
+ @SaCheckPermission("ProductionScheduling.review")
@PostMapping("/examineScheduling")
public Result examineScheduling( @RequestBody Map<String,Object> object){
--
Gitblit v1.8.0