From 0e262efdb8cb2768e0aa845ccb26f47b8732c577 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 25 六月 2025 10:37:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index fa4219c..8003028 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,10 +3,7 @@
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;
@@ -30,6 +27,15 @@
private OrderSyncHandler orderSyncHandler;
@Autowired
private OrderService orderService;
+
+
+ @Autowired
+ private OrderLogService orderLogService;
+
+ @Autowired
+ private OrderDetlLogService orderDetlLogService;
+
+
@Autowired
private ApiLogService apiLogService;
@@ -45,9 +51,12 @@
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+
private Integer page = 1;
- private Integer size = 100;
+ private Integer size = 200;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -59,7 +68,7 @@
}
//@Scheduled(cron = "0/5 * * * * ? ")
- @Scheduled(fixedDelay = 600000)
+ //@Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -73,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;
}
@@ -92,7 +101,7 @@
//@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", "閾跺骇閲囪喘鍏ュ簱鍗�"));
@@ -109,7 +118,7 @@
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
//@Scheduled(cron = "0 */1 * * * ? ")
- @Scheduled(fixedDelay = 60000)
+ @Scheduled(fixedDelay = 120000)
public void completeOrder() {
try {
Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
@@ -129,4 +138,5 @@
}
}
+
}
--
Gitblit v1.9.1