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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 fdd7b49..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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.List;
import java.util.Map;
@RestController
@@ -24,14 +25,13 @@
//鏌ヨ宸ュ崟
@ApiOperation("鏌ヨ宸ュ崟鎺ュ彛")
- @SaCheckPermission("SelectWorkOrder.search")
- @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));
}
//杞敓浜ц鍗曟煡璇�
@@ -40,7 +40,7 @@
public Result addWork(
@PathVariable String orderId,
@RequestBody OrderDetail orderDetail){
- return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
+ return Result.success(workOrderService.addDateWork(orderId,orderDetail));
}
@@ -52,29 +52,29 @@
public Result addOrderWork( @RequestBody Map<String,Object> object){
// if(workOrderService.addOrderWorkSv(object)){
-// return Result.seccess();
+// return Result.success();
// }else {
// throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
//
// }
- return Result.seccess(workOrderService.addOrderWorkSv(object));
+ return Result.success(workOrderService.addOrderWorkSv(object));
}
//鍒犻櫎宸ュ崟
@ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
- @SaCheckPermission("SelectWorkOrder.delete")
+ @SaCheckPermission("selectWorkOrder.delete")
@PostMapping("/deleteOrderWork/{orderId}/{productionId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@PathVariable String productionId
){
// if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
-// return Result.seccess();
+// return Result.success();
// }else {
// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
//
// }
- return Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
+ return Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
}
}
--
Gitblit v1.8.0