From b9d414bc2d61b4824ce6a019b1c10f526f71ced1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 四月 2025 12:56:12 +0800
Subject: [PATCH] #修改   1. 新增DO单,DO单明细

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |    6 ++++--
 1 files changed, 4 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..ee36323 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
@@ -130,8 +130,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