From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 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 61638f7..c34f803 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
@@ -163,13 +163,8 @@
     }
     @ApiOperation("mes鎶ュ伐鎺ュ彛娴嬭瘯")
     @PostMapping  ("/mesReportingWork1")
-    public Result mesReportingWork1(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException {
-        return reportingWorkService.mesReportingWorkSv1(reportingWork);
-//        if(aBoolean){
-//            return Result.success(aBoolean);
-//        }else{
-//            throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
-//        }
+    public Result mesReportingWorkSvToRedis(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException, InterruptedException {
+        return reportingWorkService.mesReportingWorkSvToRedis(reportingWork);
     }
 
     @ApiOperation("mes鎶ュ伐娆$牬鏂板")

--
Gitblit v1.8.0