From fe2653645836b28b3ffd4c848dc7cbd7e866993e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 21 五月 2022 15:58:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 14 +++-----------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 3 +++
src/main/java/com/zy/common/config/ThreadPoolConfig.java | 36 ++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/common/model/MesPakoutParam.java | 3 +++
4 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1a86031..4631099 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.task.handler.OrderSyncHandler;
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;
@@ -24,18 +25,9 @@
@Autowired
private OrderService orderService;
- @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/5 * * * * ? ")
- private void completeAndReport(){
+ @Async("orderThreadPool")
+ public void completeAndReport(){
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
for (Order order : orders) {
ReturnT<String> result = orderSyncHandler.start(order);
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 680cbb7..43b50b1 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -107,6 +107,9 @@
pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
pakoutParam.setLgortFrom("5006");
pakoutParam.setLgortTo("1111");
+ if (!pakoutParam.isTag()) {
+ pakoutParam.setKunnr("C1000");
+ }
pakoutParam.setOrderNo(order.getOrderNo());
for (OrderDetl orderDetl : orderDetls) {
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
diff --git a/src/main/java/com/zy/common/config/ThreadPoolConfig.java b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
new file mode 100644
index 0000000..1b21b47
--- /dev/null
+++ b/src/main/java/com/zy/common/config/ThreadPoolConfig.java
@@ -0,0 +1,36 @@
+package com.zy.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * Created by vincent on 2022/5/21
+ */
+@Configuration
+@EnableAsync
+public class ThreadPoolConfig {
+
+ @Bean(name = "orderThreadPool")
+ public ThreadPoolTaskExecutor orderThreadPool() {
+ ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+ int core = Runtime.getRuntime().availableProcessors();
+ core = 2;
+ //璁剧疆鏍稿績绾跨▼鏁�
+ executor.setCorePoolSize(core);
+ //璁剧疆鏈�澶х嚎绋嬫暟
+ executor.setMaxPoolSize(core * 10 + core);
+ //闄ゆ牳蹇冪嚎绋嬪鐨勭嚎绋嬪瓨娲绘椂闂�
+ executor.setKeepAliveSeconds(3);
+ //缂撳啿闃熷垪
+ executor.setQueueCapacity(core);
+ executor.setThreadNamePrefix("order-task-");
+ //璁剧疆鎷掔粷绛栫暐
+ executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+ return executor;
+ }
+
+}
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
index 464f195..2b76e0d 100644
--- a/src/main/java/com/zy/common/model/MesPakoutParam.java
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -29,6 +29,9 @@
// 鐩殑鍦� - 鍐欐
private String lgortTo;
+ // 瀹㈡埛鍙�
+ private String kunnr;
+
private List<Detl> list = new ArrayList<>();
@Data
--
Gitblit v1.9.1