From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 73 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index f579f89..b1230a1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,11 +1,13 @@
package com.zy.asrs.task;
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;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -38,7 +40,14 @@
private OrderDetlService orderDetlService;
@Autowired
+ private OrderDetlMapper orderDetlMapper;
+
+ @Autowired
private DocTypeService docTypeService;
+
+ private Integer page = 1;
+
+ private Integer size = 200;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -50,7 +59,7 @@
}
//@Scheduled(cron = "0/5 * * * * ? ")
- @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -58,21 +67,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());
@@ -87,10 +96,12 @@
//@Async("orderThreadPool")
public synchronized void reportOrder() {
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
- orderList.forEach(order -> {
- orderSyncHandler.timelyStart(order);
- });
+ if (docType != null) {
+ List<String> reportDetl = orderDetlMapper.getReportDetl(docType.getDocId());
+ reportDetl.forEach(orderNo -> {
+ orderSyncHandler.timelyStart(orderService.selectByNo(orderNo));
+ });
+ }
}
@@ -98,12 +109,24 @@
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
//@Scheduled(cron = "0 */1 * * * ? ")
- @Scheduled(fixedDelay = 60000)
+ @Scheduled(fixedDelay = 120000)
public void completeOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
- orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo(), order.getPltType());
- });
+ 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());
+ });
+ }
+ } finally {
+ page++;
+ }
}
}
--
Gitblit v1.9.1