From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 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 33e4c4e..fdd7b49 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,11 +1,14 @@
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;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.WorkOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -13,14 +16,17 @@
import java.util.Map;
@RestController
+@Api(value="宸ュ崟绠＄悊controller",tags={"宸ュ崟绠＄悊鎿嶄綔鎺ュ彛"})
@RequestMapping("/workOrder")
public class WorkOrderController {
@Autowired
WorkOrderService workOrderService;
//鏌ヨ宸ュ崟
+ @ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
+ @SaCheckPermission("SelectWorkOrder.search")
@PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
- public Result DateWork(
+ public Result dateWork(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@PathVariable Integer state,
@@ -29,38 +35,46 @@
}
//杞敓浜ц鍗曟煡璇�
+ @ApiOperation("杞敓浜ц鍗曟煡璇㈡帴鍙�")
@PostMapping ("/addWork/{orderId}")
-
- public Result AddWork(
+ public Result addWork(
@PathVariable String orderId,
@RequestBody OrderDetail orderDetail){
- return Result.seccess(workOrderService.AddDateWork(orderId,orderDetail));
+ return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
}
-
+ //娣诲姞宸ュ崟
+ @ApiOperation("娣诲姞宸ュ崟鎺ュ彛")
+ @SaCheckPermission("addWorkOrder.add")
@PostMapping("/addOrderWork")
- public Result AddOrderWork( @RequestBody Map<String,Object> object){
- System.out.println("obj:"+object);
- if(workOrderService.AddOrderWorkSv(object)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+ public Result addOrderWork( @RequestBody Map<String,Object> object){
- }
+// if(workOrderService.addOrderWorkSv(object)){
+// return Result.seccess();
+// }else {
+// throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+//
+// }
+
+ return Result.seccess(workOrderService.addOrderWorkSv(object));
}
- @PostMapping("/deleteOrderWork/{orderId}/{productName}")
+ //鍒犻櫎宸ュ崟
+ @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ @SaCheckPermission("SelectWorkOrder.delete")
+ @PostMapping("/deleteOrderWork/{orderId}/{productionId}")
public Result deleteOrderWork(
@PathVariable String orderId,
- @PathVariable String productName
+ @PathVariable String productionId
){
- if(workOrderService.DeleteOrderWorkSv(orderId,productName)){
- 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