From 5ceb1fc9be10e20d1f6e59382b2d14c8034485cf Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 21:30:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index b25e322..643003a 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,13 +1,9 @@
package com.zy.asrs.task;
-import cn.hutool.core.date.StopWatch;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -31,6 +27,15 @@
private OrderSyncHandler orderSyncHandler;
@Autowired
private OrderService orderService;
+
+
+ @Autowired
+ private OrderLogService orderLogService;
+
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
+
+
@Autowired
private ApiLogService apiLogService;
@@ -46,9 +51,12 @@
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+
private Integer page = 1;
- private Integer size = 100;
+ private Integer size = 300;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -60,11 +68,9 @@
}
//@Scheduled(cron = "0/5 * * * * ? ")
- @Scheduled(fixedDelay = 600000)
+ //@Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
- StopWatch stopWatch = new StopWatch();
- stopWatch.start();
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
@@ -76,7 +82,7 @@
Boolean flag = false;
for (OrderDetl orderDetl : orderDetlList) {
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
- if (!Cools.isEmpty(agvLocDetls)) {
+ if (!Cools.isEmpty(agvLocDetls) ) {
//鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
flag = true;
}
@@ -91,13 +97,11 @@
}
}
}
- stopWatch.stop();
- log.info("瀹氭椂浠诲姟瀹屾垚锛岃�楁椂锛歿}ms", stopWatch.getTotalTimeMillis());
}
//@Scheduled(cron = "* 0/5 * * * ? ")
//@Scheduled(cron = "0/30 * * * * ? ")
- @Scheduled(fixedDelay = 30000)
+ //@Scheduled(fixedDelay = 30000)
//@Async("orderThreadPool")
public synchronized void reportOrder() {
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
@@ -114,7 +118,7 @@
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
//@Scheduled(cron = "0 */1 * * * ? ")
- @Scheduled(fixedDelay = 60000)
+ @Scheduled(fixedDelay = 600000)
public void completeOrder() {
try {
Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
@@ -132,7 +136,7 @@
} finally {
page++;
}
- log.info("鍒嗛〉鏌ヨ瀹屾瘯锛寋}", page);
}
+
}
--
Gitblit v1.9.1