From 2a7adfe776c3c7e0aad9405cfd4cc86b2d1c134b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 20 五月 2024 11:41:20 +0800
Subject: [PATCH] 添加订单根据产品分类报表功能
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 ccef244..bb71f3d 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,6 +47,7 @@
//娣诲姞宸ュ崟
@ApiOperation("娣诲姞宸ュ崟鎺ュ彛")
+ @SaCheckPermission("addWorkOrder.add")
@PostMapping("/addOrderWork")
public Result addOrderWork( @RequestBody Map<String,Object> object){
@@ -58,16 +61,18 @@
//鍒犻櫎宸ュ崟
@ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
- @PostMapping("/deleteOrderWork/{orderId}/{productName}")
+ @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