From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:11 +0800
Subject: [PATCH] #优化修改 1. 再次收货，先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序，最新的永远在最上面
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 7687195..e34df99 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -109,6 +109,7 @@
}
}
List<WaitPakinItem> items = new ArrayList<>();
+ //涓嶈壇鏍囩缁勬墭
if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getTrackCode, tracks));
if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
@@ -129,6 +130,11 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
+ AsnOrder order = asnOrderService.getById(item.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null :order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
+ }
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
@@ -165,6 +171,12 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
+ AsnOrder order = asnOrderService.getById(item.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null :order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
+ }
+
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
@@ -184,6 +196,9 @@
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒");
}
+
+ //TODO 缁勬嫋瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
+
return pakin;
}
--
Gitblit v1.9.1