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/PakinSchedules.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 10 deletions(-)
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 9a2fb69..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
@@ -1,24 +1,19 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
-import com.vincent.rsf.server.manager.entity.WaitPakinItem;
-import com.vincent.rsf.server.manager.entity.WaitPakinItemLog;
-import com.vincent.rsf.server.manager.entity.WaitPakinLog;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.PakinIOStatus;
-import com.vincent.rsf.server.manager.service.WaitPakinItemLogService;
-import com.vincent.rsf.server.manager.service.WaitPakinItemService;
-import com.vincent.rsf.server.manager.service.WaitPakinLogService;
-import com.vincent.rsf.server.manager.service.WaitPakinService;
+import com.vincent.rsf.server.manager.service.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
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
@@ -32,6 +27,10 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private WaitPakinItemLogService waitPakinItemLogService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
/**
* @param
@@ -66,6 +65,43 @@
if (pakinItems.isEmpty()) {
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("鏁版嵁閿欒锛屽師鍗曟嵁涓嶅瓨鍦ㄦ垨宸蹭涪澶憋紒锛�");
+ }
+ 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<>();
pakinItems.forEach(item -> {
--
Gitblit v1.9.1