From 09fcde0c99664feb8aaa4d31d4abe096c2d096b9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 03 十二月 2025 22:37:47 +0800
Subject: [PATCH] 组托档历史功能优化 单据加入历史单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java | 43 +++++++++++++++++++++++++++++--------------
2 files changed, 31 insertions(+), 16 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 30b654a..0bdd761 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
@@ -142,7 +142,7 @@
log.error(e.getMessage());
}
}
- if (order.getType().equals(OrderType.ORDER_OUT.type) && order.getReportOnce() >= 4) {
+// if (order.getType().equals(OrderType.ORDER_OUT.type) && order.getReportOnce() >= 4) {
AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
if (Objects.isNull(one)) {
AsnOrderLog orderLog = new AsnOrderLog();
@@ -233,7 +233,7 @@
// if (!this.asnOrderService.removeById(order.getId())) {
// throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
// }
- }
+// }
}
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
index 3a13341..1c8fe5c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/PakinSchedules.java
@@ -13,8 +13,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Component
@@ -67,24 +66,40 @@
throw new CoolException("缁勬嫋鏄庣粏涓虹┖锛侊紒");
}
List<String> pkinItems = pakinItems.stream().map(WaitPakinItem::getAsnCode).collect(Collectors.toList());
+
pkinItems.forEach(item -> {
List<WkOrderItem> wkOrders = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderCode, item));
if (wkOrders.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛屽師鍗曟嵁涓嶅瓨鍦ㄦ垨宸蹭涪澶憋紒锛�");
}
- Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
- if (waitPakinItems.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛岀粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
- }
- Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
- if (sum.compareTo(sum1) == 0) {
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .eq(WkOrder::getCode, item)
- .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ Set<Long> orderIds = wkOrders.stream().map(WkOrderItem::getOrderId).collect(Collectors.toSet());
+ orderIds.forEach(itemId -> {
+ WkOrder wkOrder = asnOrderService.getById(itemId);
+ if (Objects.isNull(wkOrder)) {
+ throw new CoolException("鏁版嵁閿欒锛屽師鍗曟嵁涓嶅瓨鍦ㄦ垨宸蹭涪澶憋紒锛�");
}
- }
+ if (wkOrder.getAnfme().compareTo(wkOrder.getQty()) == 0) {
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, itemId)
+ .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ }
+ });
+
+// Double sum = wkOrders.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+// List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getAsnCode, item));
+// if (waitPakinItems.isEmpty()) {
+// throw new CoolException("鏁版嵁閿欒锛岀粍鎵樻槑缁嗕笉瀛樺湪锛侊紒");
+// }
+// Double sum1 = waitPakinItems.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+// if (sum.compareTo(sum1) == 0) {
+// if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+// .eq(WkOrder::getCode, item)
+// .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+// throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+// }
+// }
});
List<WaitPakinItemLog> itemLogs = new ArrayList<>();
--
Gitblit v1.9.1