From fc1dbe0c6e749a5086ef5635175b16c177000eb4 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Mon, 1 Jul 2024 17:50:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=200701-=E6=98=AF=E5=90=A6=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=89=AB=E7=A0=81=E5=89=8D=E5=88=A4=E6=96=AD=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoCodeTempController.java | 2 +- .../glxp/api/controller/inout/IoOrderDetailBizController.java | 2 +- .../api/service/inout/impl/IoOrderDetailBizServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 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 26d9264c8..fc22b6f3e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -407,7 +407,7 @@ public class IoCodeTempController extends BaseController { // return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试!"); // } // } - if (bussinessTypeEntity != null) { + if (bussinessTypeEntity != null && udiInfoEntity != null) { //是否校验耗材材质 1:高值耗材;2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index b3e8191c5..31299e3a6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -231,7 +231,7 @@ public class IoOrderDetailBizController extends BaseController { // } // } - if (bussinessTypeEntity != null){ + if (bussinessTypeEntity != null && udiRelevanceResponse != null){ //是否校验耗材材质 1:高值耗材;2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { 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 53ee58909..e1c3d2151 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 @@ -302,7 +302,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { // } // } - if (bussinessTypeEntity != null){ + if (bussinessTypeEntity != null && udiRelevanceResponse != null){ //是否校验耗材材质 1:高值耗材;2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {