From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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 | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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..e721a95 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;
@@ -12,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -23,13 +25,13 @@
//鏌ヨ宸ュ崟
@ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
- @PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
+ @SaCheckPermission("selectWorkOrder.search")
+ @PostMapping ("/orderGlassDetail/{selectDate}/{state}")
public Result dateWork(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @PathVariable List<String> selectDate,
@PathVariable Integer state,
@RequestBody OrderGlassDetail orderGlassDetail){
- return Result.seccess(workOrderService.defaultDateWork(selectTime1,selectTime2,state,orderGlassDetail));
+ return Result.success(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
}
//杞敓浜ц鍗曟煡璇�
@@ -38,36 +40,41 @@
public Result addWork(
@PathVariable String orderId,
@RequestBody OrderDetail orderDetail){
- return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
+ return Result.success(workOrderService.addDateWork(orderId,orderDetail));
}
//娣诲姞宸ュ崟
@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.success();
+// }else {
+// throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+//
+// }
- }
+ return Result.success(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.success();
+// }else {
+// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+//
+// }
+ return Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
}
}
--
Gitblit v1.8.0