From 3d66a05e01b17a57f80a422b19fbbff92a69c080 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 二月 2025 16:15:03 +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/DeviceMaintenanceController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
index 47840af..7212ad8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -22,7 +22,7 @@
DeviceMaintenanceService deviceMaintenanceService;
@ApiOperation("璁惧鏂板鎺ュ彛")
- @SaCheckPermission("AddMachine.add")
+ @SaCheckPermission("addMachine.add")
@PostMapping("/saveMachine")
public Result saveTeamGroup( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMachineSv(object)){
@@ -39,7 +39,7 @@
}
@ApiOperation("淇濆吇缁翠慨鏂板鎺ュ彛")
- @SaCheckPermission("AddMaintenanceAndRepair.add")
+ @SaCheckPermission("addMaintenanceAndRepair.add")
@PostMapping("/saveMaintenanceAndRepair")
public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
@@ -61,7 +61,7 @@
@ApiOperation("鍒犻櫎缁翠慨淇濆吇璁板綍鎺ュ彛")
- @SaCheckPermission("MaintenanceAndRepair.delete")
+ @SaCheckPermission("maintenanceAndRepair.delete")
@PostMapping("/deleteMaintenance/{id}")
public Result deleteMaintenance(@PathVariable String id){
if(deviceMaintenanceService.deleteMaintenanceSv(id)){
@@ -73,7 +73,7 @@
}
@ApiOperation("鏌ヨ璁惧绠＄悊鎺ュ彛")
- @SaCheckPermission("SelectMachine.search")
+ @SaCheckPermission("selectMachine.search")
@PostMapping ("/selectMachine")
public Result selectMachine() {
return Result.seccess(deviceMaintenanceService.selectMachineSv());
@@ -86,4 +86,12 @@
return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));
}
+
+ @ApiOperation("璁惧淇濆吇缁翠慨淇敼鎺ュ彛")
+ @PostMapping("/updateMaintenance")
+ public Result deleteOrderWork(
+ @RequestBody Map<String,Object> object
+ ){
+ return Result.seccess(deviceMaintenanceService.updateMaintenance(object));
+ }
}
--
Gitblit v1.8.0