From d5055b7870d0406f9b00d429cb47d2bfb79b902c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 十二月 2025 11:37:09 +0800
Subject: [PATCH] 补片流程卡添加打印次数
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 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..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,67 +1,80 @@
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.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
+@Api(value="宸ュ崟绠＄悊controller",tags={"宸ュ崟绠＄悊鎿嶄綔鎺ュ彛"})
@RequestMapping("/workOrder")
public class WorkOrderController {
@Autowired
WorkOrderService workOrderService;
//鏌ヨ宸ュ崟
- @PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
- public Result DateWork(
- @PathVariable Date selectTime1,
- @PathVariable Date selectTime2,
+ @ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
+ @SaCheckPermission("selectWorkOrder.search")
+ @PostMapping ("/orderGlassDetail/{selectDate}/{state}")
+ public Result dateWork(
+ @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));
}
//杞敓浜ц鍗曟煡璇�
+ @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.success(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.success();
+// }else {
+// throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+//
+// }
+
+ return Result.success(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.success();
+// }else {
+// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+//
+// }
+ return Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
}
}
--
Gitblit v1.8.0