From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 13:40:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 91d0a3e..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()) {
@@ -130,8 +131,10 @@
.setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
AsnOrder order = asnOrderService.getById(item.getAsnId());
- pakinItem.setType(order.getType())
- .setWkType(Short.parseShort(order.getWkType()));
+ 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) {
--
Gitblit v1.9.1