From c7631c62aac9c97e80ed59ebb2eebd4a314e0784 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 四月 2024 13:55:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 f646100..e6ebbbc 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
@@ -6,6 +6,8 @@
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 +15,16 @@
import java.util.Map;
@RestController
+@Api(value="宸ュ崟绠＄悊controller",tags={"宸ュ崟绠＄悊鎿嶄綔鎺ュ彛"})
@RequestMapping("/workOrder")
public class WorkOrderController {
@Autowired
WorkOrderService workOrderService;
//鏌ヨ宸ュ崟
+ @ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
@PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
- public Result DateWork(
+ public Result dateWork(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@PathVariable Integer state,
@@ -29,21 +33,22 @@
}
//杞敓浜ц鍗曟煡璇�
+ @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("娣诲姞宸ュ崟鎺ュ彛")
@PostMapping("/addOrderWork")
- public Result AddOrderWork( @RequestBody Map<String,Object> object){
- System.out.println("obj:"+object);
- if(workOrderService.AddOrderWorkSv(object)){
+ public Result addOrderWork( @RequestBody Map<String,Object> object){
+
+ if(workOrderService.addOrderWorkSv(object)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -52,12 +57,13 @@
}
//鍒犻櫎宸ュ崟
- @PostMapping("/deleteOrderWork/{orderId}/{productName}")
+ @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ @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