From 27c5a35a00fc37f7bdd727e6a53e1c8ddae81b4f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 23 九月 2025 14:52:11 +0800 Subject: [PATCH] 缓冲区功能调整 --- src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java index ea7db5a..4389d7f 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java @@ -7,6 +7,7 @@ import com.zy.asrs.enums.LocStsType; import com.zy.asrs.service.*; import com.zy.asrs.service.impl.LocCacheServiceImpl; +import com.zy.asrs.service.impl.OrderPakinServiceImpl; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import lombok.extern.slf4j.Slf4j; @@ -16,10 +17,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * Created by vincent on 2020/7/4 @@ -46,7 +45,9 @@ @Autowired private OrderDetlPakoutService orderDetlPakoutService; @Autowired - private LocCacheServiceImpl locCacheService; + private LocCacheService locCacheService; + @Autowired + private OrderPakinService orderPakinService; public ReturnT<String> start(WrkMast wrkMast) { // 4.鍏ュ簱瀹屾垚 @@ -105,6 +106,18 @@ if (!wrkMastService.updateById(wrkMast)) { throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } + + Set<Long> list = apallet.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet()); + List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("order_id", list)); + if (Objects.isNull(pakins) || pakins.isEmpty()) { + throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); + } + pakins.forEach(orderPakin -> { + orderPakin.setSettle(4L); + if (!orderPakinService.updateById(orderPakin)) { + throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒"); + } + }); } else { Date now = new Date(); LocMast locMast = locMastService.selectById(wrkMast.getLocNo()); -- Gitblit v1.9.1