From 7391ec15384def3cf84c7c33c9a4e3efc4498e2a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 三月 2021 16:36:12 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainScheduler.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainScheduler.java b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
index 8c60dcb..0bdff18 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
@@ -4,12 +4,12 @@
import com.core.common.Cools;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.service.CustOrderService;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2021/3/1
@@ -26,13 +26,33 @@
/**
* 鎵弿閿�鍞鍗曟暟鎹紝鐢熸垚鍑哄簱鍗�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
public void stockOutExecute(){
List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 1));
if (Cools.isEmpty(custOrders)){
return;
}
- mainService.stockOutProcess(custOrders);
+ Set<String> numbers = new HashSet<>();
+ custOrders.forEach(custOrder -> numbers.add(custOrder.getNumber()));
+
+ List<OrderStoDto> orderStoDtos = new ArrayList<>();
+ for (String number : numbers) {
+ List<CustOrder> list = new ArrayList<>();
+ Iterator<CustOrder> iterator = custOrders.iterator();
+ while (iterator.hasNext()) {
+ CustOrder dto = iterator.next();
+ if (number.equals(dto.getNumber())) {
+ list.add(dto);
+ iterator.remove();
+ }
+ }
+ orderStoDtos.add(new OrderStoDto(number, list));
+ }
+
+ for (OrderStoDto dto : orderStoDtos) {
+ mainService.stockOutProcess(dto);
+ }
+
}
}
--
Gitblit v1.9.1