From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 21 十月 2025 17:12:48 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java index 49b93dc..bc107d2 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java @@ -2,8 +2,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; -import com.zy.asrs.entity.Order; -import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.OrderPakin; +import com.zy.asrs.entity.OrderDetlPakout; import com.zy.asrs.entity.OrderDetlReport; import com.zy.asrs.entity.OrderDetlReportLog; import com.zy.asrs.service.OrderDetlReportLogService; @@ -32,12 +32,12 @@ private OrderDetlReportService orderDetlReportService; public ReturnT<String> start() { - List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>() + List<OrderPakin> settleEqual6 = orderService.selectList(new EntityWrapper<OrderPakin>() .eq("settle", 6)); - for (Order order : settleEqual6) { - List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>() + for (OrderPakin order : settleEqual6) { + List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>() .eq("order_no", order.getOrderNo())); - moveBoth(order, orderDetls); + moveBoth(order, orderDetlPakouts); List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo())); for (OrderDetlReport orderDetlReport : orderNo) { OrderDetlReportLog log = new OrderDetlReportLog(); @@ -50,22 +50,22 @@ return SUCCESS; } - private void moveBoth(Order order, List<OrderDetl> orderDetls) { + private void moveBoth(OrderPakin order, List<OrderDetlPakout> orderDetlPakouts) { Date now = new Date(); - if (!Cools.isEmpty(orderDetls)) { - for (OrderDetl orderDetl : orderDetls) { - orderDetl.setUpdateBy(0L); - orderDetl.setUpdateTime(now); - orderDetlService.addToLogTable(orderDetl); - orderDetlService.delete(new EntityWrapper<OrderDetl>() - .eq("id", orderDetl.getId())); + if (!Cools.isEmpty(orderDetlPakouts)) { + for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) { + orderDetlPakout.setUpdateBy(0L); + orderDetlPakout.setUpdateTime(now); + orderDetlService.addToLogTable(orderDetlPakout); + orderDetlService.delete(new EntityWrapper<OrderDetlPakout>() + .eq("id", orderDetlPakout.getId())); } } if (!Cools.isEmpty(order)) { order.setUpdateBy(0L); order.setUpdateTime(now); orderService.addToLogTable(order); - orderService.delete(new EntityWrapper<Order>() + orderService.delete(new EntityWrapper<OrderPakin>() .eq("id", order.getId())); } } -- Gitblit v1.9.1