From 3889e77a2c547d80b95b3c652282db30a705dd13 Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 23 Dec 2024 20:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E4=B8=8E?= =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E6=A0=A1=E9=AA=8C=E7=9B=B8=E5=85=B3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 7 +++++-- .../glxp/api/service/collect/down/ThrOrderDownload.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index dc89c0b52..fa17d7e0f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -989,9 +989,12 @@ public class IoCodeTempController extends BaseController { if (codeEnttitys.size() > 0) { exitLocalEntity = isExitLocal(code, codeEnttitys); if (exitLocalEntity != null) { - if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) { - return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！"); + if (!(bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT))) { + if (StrUtil.isEmpty(exitLocalEntity.getSupId()) || exitLocalEntity.getRelId() == null) { + return ResultVOUtils.error(500, "当前UDI码已存在，且存在异常未处理！"); + } } + udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(exitLocalEntity.getNameCode(), null); BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java index 3c080e846..7ae2ac833 100644 --- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java +++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java @@ -121,9 +121,11 @@ public class ThrOrderDownload implements IDownload { prefixMatchWrapper.apply("LEFT(ybbm, 20) = LEFT({0}, 20)", entity.getCheckCode()); exactMatches = basicProductsDao.selectList(prefixMatchWrapper); } + collectOrderBiz.setRelId(entity.getRelId()); if (exactMatches.isEmpty()) { errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";"); } + } else { BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1")); if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) {