From d24fe63ca52f0c9d795512890c5e00d304d9f4fc Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 1 Jul 2024 17:48:33 +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   | 4 ++--
 .../glxp/api/controller/inout/IoOrderDetailBizController.java | 4 ++--
 2 files changed, 4 insertions(+), 4 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 cf2ab775..5693949b 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -429,7 +429,7 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-//        if(udiInfoEntity.getRequireScanCode() == 1){
+        if(bussinessTypeEntity != null ){
             //是否校验耗材材质  1：高值耗材；2.普通耗材
             if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
@@ -440,7 +440,7 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                 }
             }
-//        }
+        }
 
         String orderId = addOrderRequest.getBillNo();
 
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 4acdddc8..d26b72d3 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -201,7 +201,7 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-//            if(udiRelevanceResponse.getRequireScanCode() == 1) {
+            if(bussinessTypeEntity != null) {
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@@ -212,7 +212,7 @@ public class IoOrderDetailBizController extends BaseController {
                         return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                     }
                 }
-//            }
+            }
 
             if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), authAdmin.getCustomerId());