From bae4b94d9d30aab92fb86a302240f257bd7e0d99 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 15 九月 2025 14:34:28 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index fad8d68..18dce3d 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,19 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
-import com.zy.common.utils.Synchro;
+import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.HashMap;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -53,9 +55,12 @@
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private AgvWrkDetlService agvWrkDetlService;
+
private Integer page = 1;
- private Integer size = 200;
+ private Integer size = 500;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -67,7 +72,7 @@
}
//@Scheduled(cron = "0/5 * * * * ? ")
- @Scheduled(fixedDelay = 600000)
+ //@Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -81,7 +86,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;
}
@@ -100,7 +105,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", "閾跺骇閲囪喘鍏ュ簱鍗�"));
@@ -117,26 +122,29 @@
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
//@Scheduled(cron = "0 */1 * * * ? ")
- @Scheduled(fixedDelay = 120000)
+ @Scheduled(fixedDelay = 300000)
public void completeOrder() {
- try {
- Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
- if (settle != null) {
- List<Order> orderList = settle.getRecords();
- if (orderList == null || orderList.isEmpty()) {
- log.info("杞瀹屾瘯锛寋},{}", page, settle.getTotal());
- page = 1;
- return;
+ Calendar calendar = Calendar.getInstance();
+ int i = calendar.get(Calendar.HOUR);
+ if (i >= 23 || i < 7){
+ try {
+ Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
+ if (settle != null) {
+ List<Order> orderList = settle.getRecords();
+ if (orderList == null || orderList.isEmpty()) {
+ log.info("杞瀹屾瘯锛寋},{}", page, settle.getTotal());
+ page = 1;
+ return;
+ }
+ orderList.forEach(order -> {
+ orderService.checkComplete2(order.getOrderNo());
+ });
}
- orderList.forEach(order -> {
- orderService.checkComplete2(order.getOrderNo());
- });
+ } finally {
+ page++;
}
- } finally {
- page++;
}
}
-
}
--
Gitblit v1.9.1