From 6edc05acd8bb1de3bedbf093c618d429c62d446b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 16 五月 2024 13:59:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
index ccef244..e67f4d4 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.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.sd.OrderGlassDetail;
@@ -23,6 +24,7 @@
//鏌ヨ宸ュ崟
@ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
+ @SaCheckPermission("SelectWorkOrder.search")
@PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
public Result dateWork(
@PathVariable Date selectTime1,
@@ -45,6 +47,7 @@
//娣诲姞宸ュ崟
@ApiOperation("娣诲姞宸ュ崟鎺ュ彛")
+ @SaCheckPermission("addWorkOrder.add")
@PostMapping("/addOrderWork")
public Result addOrderWork( @RequestBody Map<String,Object> object){
@@ -58,12 +61,13 @@
//鍒犻櫎宸ュ崟
@ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
- @PostMapping("/deleteOrderWork/{orderId}/{productName}")
+ @SaCheckPermission("SelectWorkOrder.delete")
+ @PostMapping("/deleteOrderWork/{orderId}/{productionId}")
public Result deleteOrderWork(
@PathVariable String orderId,
- @PathVariable String productName
+ @PathVariable String productionId
){
- if(workOrderService.deleteOrderWorkSv(orderId,productName)){
+ if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
--
Gitblit v1.8.0