From fcf705e1f9a369cab61e60d72048c36a0e1ee793 Mon Sep 17 00:00:00 2001 From: guoyuji <guoyujie@ng.com> Date: 星期四, 07 三月 2024 13:48:26 +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 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 1c9e1ca..f3c2a1b 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 @@ -20,7 +20,7 @@ //鏌ヨ宸ュ崟 @PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}") - public Result DateWork( + public Result dateWork( @PathVariable Date selectTime1, @PathVariable Date selectTime2, @PathVariable Integer state, @@ -31,19 +31,19 @@ //杞敓浜ц鍗曟煡璇� @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)); } //娣诲姞宸ュ崟 @PostMapping("/addOrderWork") - public Result AddOrderWork( @RequestBody Map<String,Object> object){ + public Result addOrderWork( @RequestBody Map<String,Object> object){ - if(workOrderService.AddOrderWorkSv(object)){ + if(workOrderService.addOrderWorkSv(object)){ return Result.seccess(); }else { throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触"); @@ -57,7 +57,7 @@ @PathVariable String orderId, @PathVariable String productName ){ - if(workOrderService.DeleteOrderWorkSv(orderId,productName)){ + if(workOrderService.deleteOrderWorkSv(orderId,productName)){ return Result.seccess(); }else { throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触"); -- Gitblit v1.8.0