From cd7057f38613e7dd56f830a7519e5d0ae93c8628 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 10 四月 2026 12:51:29 +0800
Subject: [PATCH] U8单据对接
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 05d7cba..ab7b40e 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,14 +1,21 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -18,36 +25,55 @@
public class OrderSyncScheduler {
@Autowired
+ private OrderSyncHandler orderSyncHandler;
+ @Autowired
private OrderService orderService;
+ @Autowired
+ private ApiLogService apiLogService;
- @Scheduled(cron = "0/3 * * * * ? ")
- private void queryAndSave(){
-// for (WrkMast wrkMast : wrkMasts) {
-// ReturnT<String> result = workLogHandler.start(wrkMast);
-// if (!result.isSuccess()) {
-// log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
-// }
-// }
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void clearApiLog(){
+ try {
+ apiLogService.clearWeekBefore();
+ } catch (Exception e) {
+ log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
+ }
}
- @Scheduled(cron = "0/3 * * * * ? ")
- private void completeAndReport(){
- // 鎵�鏈夎鍗�
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- for (Order order : orders) {
-// OpenOrderCompeteResult result = new OpenOrderCompeteResult();
-// results.add(result);
-// result.setOrderNo(order.getOrderNo());
-// result.setOrderTime(order.getOrderTime());
-// result.setOrderType(order.getDocType$());
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// for (OrderDetl orderDetl : orderDetls) {
-// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
-// }
-// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
+ @Resource
+ private ThreadPoolTaskExecutor orderThreadPool;
+
+ @Scheduled(cron = "0 * * * * ? ")
+// @Scheduled(cron = "0 0/2 * * * ?")
+ // 10鍒嗛挓鎵ц涓�娆�
+// @Scheduled(cron = "0 0/10 * * * ?")
+ public void completeAndReport() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = orderService.selectComplete();
+ if (orders.isEmpty()) {
+ return;
+ }
+ // 鎸夊崟鎹被鍨嬪垎缁�
+ Map<String, List<Order>> groupedOrders = orders.stream()
+ .collect(Collectors.groupingBy(order -> {
+ String type = order.getDocType$();
+ switch (type) {
+ case "鎴愬搧鍑哄簱鍗�":
+ return "閿�鍞彂璐у崟";
+ case "鎴愬搧鍏ュ簱鍗�":
+ return "鐢熶骇璁㈠崟";
+ case "棰嗘枡鍗�":
+ return "棰嗘枡鐢宠鍗�";
+ default:
+ return type;
+ }
+ }));
+ for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
+ orderThreadPool.submit(() -> {
+ orderSyncHandler.startNew(map);
+ });
+ }
}
}
--
Gitblit v1.9.1