diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java index fb74eb7..be5b5dd 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @RestController @@ -58,7 +59,11 @@ public class DeliveryController { // 单据名称集合 List nameList = new ArrayList<>(); // 判定是否是到库单 - String typeByKey = deliveryService.getByKey(siteName, receiveRequestName).getReceiveRequestType(); + MaterialReceiveRequest byKey = deliveryService.getByKey(siteName, receiveRequestName); + if (Objects.isNull(byKey)) { + return AjaxResult.me().setSuccess(false).setMessage("不存在该单据"); + } + String typeByKey = byKey.getReceiveRequestType(); // 到货单 String deliveryName = null; if (typeByKey.equals(ReceiveTypeEnums.DK.getCode())) {