From d7c7cbbe2ba964b92e31e36d15c6941b4328b9b4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 16:31:38 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 121 ++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 31 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..93257c8 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,16 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderService;
+import com.core.common.Cools;
+import com.zy.asrs.entity.*;
+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.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -18,37 +24,90 @@
public class OrderSyncScheduler {
@Autowired
- private OrderService orderService;
+ private OrderSyncHandler orderSyncHandler;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlReportService orderDetlReportService;
+ @Autowired
+ private OrderDetlReportLogService orderDetlReportLogService;
+ @Autowired
+ private OrderReportService orderReportService;
+ @Autowired
+ private OrderReportLogService orderReportLogService;
- @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/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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void clearApiLog() {
+ try {
+ apiLogService.clearWeekBefore();
+ } catch (Exception e) {
+ log.error("绗笁鏂规帴鍙ｆ棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
}
}
+
+ /**
+ * 璁㈠崟鐘舵��4鑷�6,骞朵笖鍐欏叆涓婃姤琛�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeOrderPakin() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakin> orders = orderPakinService.selectComplete();
+ for (OrderPakin order : orders) {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+ /**
+ * 璁㈠崟鐘舵��4鑷�6,骞朵笖鍐欏叆涓婃姤琛�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeOrderPakout() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderPakout> orders = orderPakoutService.selectComplete();
+ for (OrderPakout order : orders) {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+
+ //@Scheduled(cron = "0 0 3 * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void clearReportLog() {
+ try {
+ List<OrderReport> orderReports = orderReportService.selectList(new EntityWrapper<OrderReport>().eq("status", 1).eq("settle", 4));
+ for (OrderReport orderReport : orderReports) {
+ List<OrderDetlReportLog> orderId = orderDetlReportLogService.selectList(new EntityWrapper<OrderDetlReportLog>().eq("order_id", orderReport.getId()));
+ for (OrderDetlReportLog orderDetl : orderId) {
+ OrderDetlReportLog orderDetlReportLog = new OrderDetlReportLog();
+ orderDetlReportLog.sync(orderDetl);
+ orderDetlReportLog.setId(null);
+ orderDetlReportLogService.insert(orderDetlReportLog);
+ orderDetlReportService.deleteById(orderDetl.getId());
+ }
+ OrderReportLog reportLog = new OrderReportLog();
+ Synchro.Copy(orderReport, reportLog);
+ orderReportLogService.insert(reportLog);
+ orderReportService.deleteById(orderReport.getId());
+ }
+ } catch (Exception e) {
+ log.error("涓婃姤鏃ュ織鍒犻櫎", e);
+ }
+ }
}
--
Gitblit v1.9.1