From 4dcb5e299757924aef0edc4d608d2305dbedc780 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 18 九月 2025 08:59:33 +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/ReportingWorkController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index a84d046..967bcb7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -89,9 +89,11 @@
@ApiOperation("鍒犻櫎鎶ュ伐鎺ュ彛")
@SaCheckPermission("selectReportingWorks.delete")
@PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}/{userId}/{userName}")
- public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,
- @PathVariable String thisProcess,@PathVariable String userId
- ,@PathVariable String userName){
+ public Result deleteWork(@PathVariable String reportingWorkId,
+ @PathVariable String processId,
+ @PathVariable String thisProcess,
+ @PathVariable String userId
+ ,@PathVariable String userName){
return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess,userId,userName));
@@ -192,4 +194,14 @@
public Result saveWorkStorage( @RequestBody Map<String,Object> object){
return Result.seccess(reportingWorkService.saveWorkStorage(object));
- }}
+ }
+
+ @ApiOperation("Mes鎶ュ伐鍩虹鏁版嵁")
+ @PostMapping ("/mesBasicData")
+ public Result mesBasicData() {
+ return Result.seccess(reportingWorkService.mesBasicDataSv());
+ }
+
+}
+
+
--
Gitblit v1.8.0