From 0b190d8a9aad67aa521ec163b437c59f6e63c400 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 14:04:27 +0800
Subject: [PATCH] 盘点单下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 65 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 12 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 5692412..09ec461 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,11 +2,12 @@
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;
+import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.AsnOrderItemLogService;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
@@ -19,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@@ -54,18 +54,57 @@
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void moveOrderToLog() {
- List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>().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;
}
- Set<Long> longSet = asnOrders.stream().map(AsnOrder::getId).collect(Collectors.toSet());
- List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getAsnId, longSet));
+ moveOrderToLog(wkOrders, OrderType.ORDER_IN.type);
+ }
+
+
+ /**
+ * @author Ryan
+ * @description 鍑哄簱鍗曞畬鎴愬悗锛岀姸鎬佷慨鏀�
+ * @param
+ * @return
+ * @time 2025/6/16 08:35
+ */
+// @Scheduled(cron = "0/30 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void outStockComplete() {
+ List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getType, OrderType.ORDER_OUT.type)
+ .apply("anfme = work_qty")
+ );
+ if (wkOrders.isEmpty()) {
+ return;
+ }
+ moveOrderToLog(wkOrders, OrderType.ORDER_OUT.type);
+ }
+
+ /**
+ * @param
+ * @param type
+ * @return
+ * @author Ryan
+ * @description 娣诲姞鍘嗗彶鍗曟嵁
+ * @time 2025/6/16 08:56
+ */
+ 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);
+ order.setQty(order.getWorkQty());
+ }
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
@@ -75,26 +114,28 @@
}
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())
.setLogId(orderLog.getId())
- .setAsnId(item.getAsnId());
+ .setAsnId(item.getOrderId());
logs.add(itemLog);
});
if (!asnOrderItemLogService.saveBatch(logs)) {
- throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
+ throw new CoolException("鍗曟嵁鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
}
}
- 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)) {
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
}
+
+
}
--
Gitblit v1.9.1