From 5cf7fe680122f247c6d15fa70aa49256a3f33bce Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 11:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 34 ++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 8 ++++++++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 3 ++-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 1 +
4 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index 2f1081a..c2a7f49 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -18,4 +18,12 @@
public void execute(){
orderMoveHistoryHandler.start();
}
+
+ /**
+ * 灏嗗凡涓婃姤order鍜宱rderDetl绉诲姩鍒發og琛�
+ */
+ @Scheduled(cron = "0/30 * * * * ?")
+ public void executeOrder(){
+ orderMoveHistoryHandler.startOrder();
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c0f70c5..90ced31 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -39,6 +39,7 @@
}
}
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderInAndOutUtil() {
String erpReport = Parameter.get().getErpReport();
@@ -53,7 +54,7 @@
}
}
- // @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrder() {
String erpReport = Parameter.get().getErpReport();
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 ae177fd..11c0b25 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -46,6 +46,20 @@
return SUCCESS;
}
+ public ReturnT<String> startOrder(){
+ 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 = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ moveBothOrder(order,orderDetls);
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
+ }
+ return SUCCESS;
+ }
+
private void moveBoth(Order order, List<OrderDetl> orderDetls){
Date now = new Date();
if (!Cools.isEmpty(orderDetls)) {
@@ -80,4 +94,24 @@
}
}
+ private void moveBothOrder(Order order, List<OrderDetl> orderDetls){
+ 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(order)){
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ orderService.addToLogTable(order);
+ orderService.delete(new EntityWrapper<Order>()
+ .eq("id",order.getId()));
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 0feb909..fb44ebd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -55,6 +55,7 @@
orderService.insert(orderNew);
for (OrderDetl orderDetl : orderDetls){
OrderDetl orderDetlNew = new OrderDetl(orderDetl);
+ orderDetlNew.setOrderId(orderNew.getId());
orderDetlService.insert(orderDetlNew);
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
--
Gitblit v1.9.1