From e03ed5c541b8501dd0b8726d743407c94fe71cfe Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 13:24:16 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index be17fde..5ad4d08 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
@@ -54,13 +54,13 @@
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getType, OrderType.ORDER_IN.type)
- .eq(AsnOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
- if (asnOrders.isEmpty()) {
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
+ if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(asnOrders, OrderType.ORDER_IN.type);
+ moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
}
@@ -71,18 +71,33 @@
* @return
* @time 2025/6/16 08:35
*/
- @Scheduled(cron = "0/30 * * * * ? ")
+// @Scheduled(cron = "0/30 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void outStockComplete() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getType, OrderType.ORDER_OUT.type)
- .apply("anfme=work_qty")
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .eq(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val)
+ .apply("anfme = work_qty")
);
- if (asnOrders.isEmpty()) {
+ if (wkOrders.isEmpty()) {
return;
}
- moveOrderToLog(asnOrders, OrderType.ORDER_OUT.type);
+ moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
}
+
+// /**
+// * @author Ryan
+// * @date 2025/7/30
+// * @description: 鏇存柊璋冩嫈鍗曠姸鎬�
+// * @version 1.0
+// */
+// @Scheduled(cron = "0/30 * * * * ? ")
+// @Transactional(rollbackFor = Exception.class)
+// public void updateTransferExc() {
+//
+// }
+
+
/**
* @param
@@ -92,14 +107,15 @@
* @description 娣诲姞鍘嗗彶鍗曟嵁
* @time 2025/6/16 08:56
*/
- private void moveOrderToLog(List<AsnOrder> asnOrders, String type) {
- Set<Long> longSet = asnOrders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet));
+ private void moveOrderToLog(List<WkOrder> wkOrders, String type) {
+ Set<Long> longSet = wkOrders.stream().map(WkOrder::getId).collect(Collectors.toSet());
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, longSet));
if (orderItems.isEmpty()) {
throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
}
- for (AsnOrder order : asnOrders) {
+ for (WkOrder order : wkOrders) {
AsnOrderLog orderLog = new AsnOrderLog();
if (type.equals(OrderType.ORDER_OUT.type)) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
@@ -114,13 +130,15 @@
}
List<AsnOrderItemLog> logs = new ArrayList<>();
- List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()));
+ List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
itemLog.setAsnItemId(itemLog.getId())
+ .setId(null)
.setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
+ .setAsnId(item.getOrderId());
logs.add(itemLog);
});
@@ -129,7 +147,8 @@
}
}
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet))) {
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+ .in(WkOrderItem::getOrderId, longSet))) {
throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
}
if (!this.asnOrderService.removeByIds(longSet)) {
--
Gitblit v1.9.1