From 58b8ab921ba5b855807872c849705d3f176dffb5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 二月 2025 11:38:59 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 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..c72487c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,10 +3,8 @@
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.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -47,7 +45,7 @@
private Integer page = 1;
- private Integer size = 100;
+ private Integer size = 200;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -67,21 +65,21 @@
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
//濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
- if (order.getDocType() == 33) {
- //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- 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)) {
- //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
- flag = true;
- }
- }
- if (flag) {
- continue;
- }
- }
+// if (order.getDocType() == 33) {
+// //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
+// List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+// 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)) {
+// //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
+// flag = true;
+// }
+// }
+// if (flag) {
+// continue;
+// }
+// }
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
//log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
@@ -109,7 +107,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));
--
Gitblit v1.9.1