From 7abc1ed37a17dc7a46289e9373c51d0d38dd11f3 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 05 六月 2025 15:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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..adabcae 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -4,6 +4,10 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlReport;
+import com.zy.asrs.entity.OrderDetlReportLog;
+import com.zy.asrs.service.OrderDetlReportLogService;
+import com.zy.asrs.service.OrderDetlReportService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
@@ -22,6 +26,10 @@
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderDetlReportLogService orderDetlReportLogService;
+ @Autowired
+ private OrderDetlReportService orderDetlReportService;
public ReturnT<String> start(){
List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
@@ -30,6 +38,13 @@
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("order_no", order.getOrderNo()));
moveBoth(order,orderDetls);
+ List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
+ for (OrderDetlReport orderDetlReport : orderNo){
+ OrderDetlReportLog log = new OrderDetlReportLog();
+ log.sync(orderDetlReport);
+ orderDetlReportLogService.insert(log);
+ orderDetlReportService.deleteById(orderDetlReport);
+ }
log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
}
return SUCCESS;
--
Gitblit v1.9.1