From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/OrderTimer.java | 84 +++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/OrderTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/OrderTimer.java
index 9f52217..d89849d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/OrderTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/OrderTimer.java
@@ -31,65 +31,59 @@
@Autowired
private OrderDetlFieldLogService orderDetlFieldLogService;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/13 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void orderToHistory() {
- InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
- try {
- List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderSettle, OrderSettleType.COMPLETE.val()));
- if (list.isEmpty()) {
- return;
+ List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getOrderSettle, OrderSettleType.COMPLETE.val()));
+ if (list.isEmpty()) {
+ return;
+ }
+ for (Order order : list) {
+ //杞巻鍙叉。
+ OrderLog orderLog = new OrderLog();
+ orderLog.sync(order);
+ orderLog.setOrderId(order.getId());
+ orderLog.setId(null);
+ if (!orderLogService.save(orderLog)) {
+ throw new CoolException("璁㈠崟杞巻鍙叉。澶辫触");
}
- for (Order order : list) {
- //杞巻鍙叉。
- OrderLog orderLog = new OrderLog();
- orderLog.sync(order);
- if (!orderLogService.save(orderLog)) {
- throw new CoolException("璁㈠崟杞巻鍙叉。澶辫触");
+ //璁㈠崟鏄庣粏杞巻鍙叉。
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderId, order.getId()));
+ for (OrderDetl orderDetl : orderDetls) {
+ OrderDetlLog orderDetlLog = new OrderDetlLog();
+ orderDetlLog.sync(orderDetl);
+ orderDetlLog.setId(null);
+ if(!orderDetlLogService.save(orderDetlLog)) {
+ throw new CoolException("璁㈠崟鏄庣粏杞巻鍙叉。澶辫触");
}
- //璁㈠崟鏄庣粏杞巻鍙叉。
- List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
- for (OrderDetl orderDetl : orderDetls) {
- OrderDetlLog orderDetlLog = new OrderDetlLog();
- orderDetlLog.sync(orderDetl);
- if(!orderDetlLogService.save(orderDetlLog)) {
- throw new CoolException("璁㈠崟鏄庣粏杞巻鍙叉。澶辫触");
+ //鏄庣粏鎵╁睍瀛楁杞巻鍙叉。
+ List<OrderDetlField> orderDetlFields = orderDetlFieldService.list(new LambdaQueryWrapper<OrderDetlField>().eq(OrderDetlField::getDetlId, orderDetl.getId()));
+ for (OrderDetlField orderDetlField : orderDetlFields) {
+ OrderDetlFieldLog orderDetlFieldLog = new OrderDetlFieldLog();
+ orderDetlFieldLog.sync(orderDetlField);
+ if(!orderDetlFieldLogService.save(orderDetlFieldLog)) {
+ throw new CoolException("鏄庣粏鎵╁睍瀛楁杞巻鍙叉。澶辫触");
}
- //鏄庣粏鎵╁睍瀛楁杞巻鍙叉。
- List<OrderDetlField> orderDetlFields = orderDetlFieldService.list(new LambdaQueryWrapper<OrderDetlField>().eq(OrderDetlField::getDetlId, orderDetl.getId()));
- for (OrderDetlField orderDetlField : orderDetlFields) {
- OrderDetlFieldLog orderDetlFieldLog = new OrderDetlFieldLog();
- orderDetlFieldLog.sync(orderDetlField);
- if(!orderDetlFieldLogService.save(orderDetlFieldLog)) {
- throw new CoolException("鏄庣粏鎵╁睍瀛楁杞巻鍙叉。澶辫触");
- }
-
- //鍒犻櫎鏄庣粏鎵╁睍瀛楁
- if (!orderDetlFieldService.removeById(orderDetlField.getId())) {
- throw new CoolException("鍒犻櫎鏄庣粏鎵╁睍瀛楁澶辫触");
- }
- }
-
- //鍒犻櫎璁㈠崟鏄庣粏
- if (!orderDetlService.removeById(orderDetl)) {
- throw new CoolException("鍒犻櫎璁㈠崟鏄庣粏澶辫触");
+ //鍒犻櫎鏄庣粏鎵╁睍瀛楁
+ if (!orderDetlFieldService.removeById(orderDetlField.getId())) {
+ throw new CoolException("鍒犻櫎鏄庣粏鎵╁睍瀛楁澶辫触");
}
}
- //鍒犻櫎璁㈠崟
- if (!orderService.removeById(order.getId())) {
- throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
+ //鍒犻櫎璁㈠崟鏄庣粏
+ if (!orderDetlService.removeById(orderDetl)) {
+ throw new CoolException("鍒犻櫎璁㈠崟鏄庣粏澶辫触");
}
}
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }finally {
- InterceptorIgnoreHelper.clearIgnoreStrategy();
+ //鍒犻櫎璁㈠崟
+ if (!orderService.removeById(order.getId())) {
+ throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
+ }
}
}
--
Gitblit v1.9.1