From 771aa6ba5f15b28b392286fce7256ada0b38691c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 28 Mar 2025 14:23:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=98=B3=E9=87=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/alihealth/impl/AlihealthBusServiceImpl.java | 9 +++++++++ .../service/inout/impl/IoOrderDetailBizServiceImpl.java | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index a8a25deee..48bf93fd3 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -144,9 +144,18 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { AddOrderRequest addOrderRequest = new AddOrderRequest(); BeanUtils.copyProperties(ioOrderEntity, addOrderRequest); + String ycBillNo = ioOrderEntity.getYcBillNo(); for (int j = 0; j < list.size(); j++) { YcFileCodeUploadVo ycFileCodeUploadVo = list.get(j); + + //第一条进行 阳采单号的校验 + if (j == 0 && StringUtils.isNotEmpty(ycBillNo)){ + String ycBillNo1 = ycFileCodeUploadVo.getYcBillNo(); + throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 "); + } + + String code = ycFileCodeUploadVo.getCode(); addOrderRequest.setCode(code); UdiEntity udiEntity = FilterUdiUtils.getUdi(code); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 2d715c858..12fcae10c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -689,7 +689,9 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); - + if (udiRelevanceResponse == null){ + return ResultVOUtils.error(604, "当前产品未维护！"); + } //近效期提醒 long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null)