From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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 | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 e6ebbbc..2c980ad 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,29 +47,34 @@
//娣诲姞宸ュ崟
@ApiOperation("娣诲姞宸ュ崟鎺ュ彛")
+ @SaCheckPermission("addWorkOrder.add")
@PostMapping("/addOrderWork")
public Result addOrderWork( @RequestBody Map<String,Object> object){
- if(workOrderService.addOrderWorkSv(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+// if(workOrderService.addOrderWorkSv(object)){
+// return Result.seccess();
+// }else {
+// throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+//
+// }
- }
+ return Result.seccess(workOrderService.addOrderWorkSv(object));
}
//鍒犻櫎宸ュ崟
@ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ @SaCheckPermission("selectWorkOrder.delete")
@PostMapping("/deleteOrderWork/{orderId}/{productionId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@PathVariable String productionId
){
- if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
-
- }
+// if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
+// return Result.seccess();
+// }else {
+// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+//
+// }
+ return Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
}
}
--
Gitblit v1.8.0