From ed381604d4cb6b186ed4bacb9eceb4908b857de2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 十二月 2025 10:02:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 4 ++--
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 2 +-
north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 4396c4a..f488d93 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -317,7 +317,7 @@
{{ row.orderId }}
{{ row.customerName?'--':'' }}
{{ row.customerName}}
- {{ row.project?'--':'' }}
+ {{row.project?'--':'' }}
{{row.project}}
{{ row.batch?'--':'' }}
{{row.batch}}
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 c34f803..16a3465 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
@@ -161,8 +161,8 @@
throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
}
}
- @ApiOperation("mes鎶ュ伐鎺ュ彛娴嬭瘯")
- @PostMapping ("/mesReportingWork1")
+ @ApiOperation("mes鎶ュ伐鎺ュ彛Redis")
+ @PostMapping ("/mesReportingWorkRedis")
public Result mesReportingWorkSvToRedis(@RequestBody Map<String,Object> reportingWork) throws JsonProcessingException, InterruptedException {
return reportingWorkService.mesReportingWorkSvToRedis(reportingWork);
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java b/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
index b4a05a5..919dc4b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
+++ b/north-glass-erp/src/main/java/com/example/erp/scheduling/ScheduledTasks.java
@@ -10,8 +10,8 @@
public class ScheduledTasks {
private final ReportingWorkService reportingWorkService;
-// @Scheduled( fixedRate = 2*60*1000)
-// public void reportingWorkRedisToMysql() throws InterruptedException {
-// reportingWorkService.redisToMysqlReportingWork();
-// }
+ @Scheduled( fixedRate = 2*60*1000)
+ public void reportingWorkRedisToMysql() throws InterruptedException {
+ reportingWorkService.redisToMysqlReportingWork();
+ }
}
--
Gitblit v1.8.0