From 2a534b8afd115ec4a566be611a4be7f543c9a3af Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 十二月 2024 16:23:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 76ec280..ae177fd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -2,12 +2,13 @@
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.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
+import com.zy.asrs.service.impl.OrderPakinServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,14 +22,24 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderDetlPakinServiceImpl orderDetlPakinService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
public ReturnT<String> start(){
- List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
- .eq("settle", 6));
+// List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
+// .eq("settle", 6));
+ List<Order> settleEqual6 = OrderInAndOutUtil.selectBySettle(null, 6L);
for (Order order : settleEqual6) {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
- .eq("order_no", order.getOrderNo()));
+// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
+// .eq("order_no", order.getOrderNo()));
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
moveBoth(order,orderDetls);
log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
}
@@ -41,17 +52,31 @@
for (OrderDetl orderDetl : orderDetls) {
orderDetl.setUpdateBy(0L);
orderDetl.setUpdateTime(now);
- orderDetlService.addToLogTable(orderDetl);
- orderDetlService.delete(new EntityWrapper<OrderDetl>()
- .eq("id",orderDetl.getId()));
+// orderDetlService.addToLogTable(orderDetl);
+ OrderInAndOutUtil.addToLogTableOrderDetl(order.getPakinPakoutStatus$(),orderDetl);
+ if (order.getPakinPakoutStatus() == 1){
+ orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>()
+ .eq("id",orderDetl.getId()));
+ } else {
+ orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>()
+ .eq("id",orderDetl.getId()));
+ }
}
}
if (!Cools.isEmpty(order)){
order.setUpdateBy(0L);
order.setUpdateTime(now);
- orderService.addToLogTable(order);
- orderService.delete(new EntityWrapper<Order>()
- .eq("id",order.getId()));
+// orderService.addToLogTable(order);
+ OrderInAndOutUtil.addToLogTableOrder(order.getPakinPakoutStatus$(),order);
+// orderService.delete(new EntityWrapper<Order>()
+// .eq("id",order.getId()));
+ if (order.getPakinPakoutStatus() == 1){
+ orderPakinService.delete(new EntityWrapper<OrderPakin>()
+ .eq("id",order.getId()));
+ } else {
+ orderPakoutService.delete(new EntityWrapper<OrderPakout>()
+ .eq("id",order.getId()));
+ }
}
}
--
Gitblit v1.9.1