From 9670fb22929050e19e3eb50792f0bc5ca8e380cc Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 21 Nov 2024 16:25:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/thrsys/impl/ThrInvOrderServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 5343ce73a..c4ce15e22 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -1561,7 +1561,14 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { list.forEach(item -> { String mainAction = item.getMainAction(); String thrCode = item.getThrCode(); - Long relId = mainIdRelIdMap.get(thrCode).getId(); + Long relId = null; + if (mainIdRelIdMap != null){ + UdiRelevanceEntity udiRelevanceEntity = mainIdRelIdMap.get(thrCode); + if (udiRelevanceEntity != null){ + relId = udiRelevanceEntity.getId(); + } + } + Integer count; if (ConstantType.TYPE_PUT.equals(mainAction)) { count = IntUtil.value(item.getInCount()); @@ -1577,6 +1584,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { if (ObjectUtil.isNull(relId)) { exmsg.append(thrCode + ","); } + if (relId != null){ //校验产品是否被供应商关联 List udiRlSupEntitys = udiRlSupService.findByUdiRlId(relId); if (CollUtil.isNotEmpty(udiRlSupEntitys)) { @@ -1601,6 +1609,9 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { } else exmsg.append(thrCode + "供应商未关联"); + } else + exmsg.append(thrCode + "供应商未关联"); + //过滤是否高值 if (IntUtil.value(highFilter) > 0) {