From a33b607376ebb8787c5b532cc579be4ec72018aa Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 4 Jun 2024 14:29:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200604=E5=A2=9E=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           | 19 ++++++++++---------
 .../inout/IoOrderDetailBizController.java     | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 17 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 19226c41..293ca3de 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -429,18 +429,19 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        //是否校验耗材材质  1：高值耗材；2.普通耗材
-        if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
-            if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
-                return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
-            }
-        } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
-            if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
-                return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+        if(udiInfoEntity.getRequireScanCode() == 1){
+            //是否校验耗材材质  1：高值耗材；2.普通耗材
+            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+                if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
+                    return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+                }
+            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
+                    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 461efcac..743a7a3e 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
@@ -201,14 +201,16 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-            //是否校验耗材材质  1：高值耗材；2.普通耗材
-            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
-                    return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
-                }
-            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
-                    return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+            if(udiRelevanceResponse.getRequireScanCode() == 1) {
+                //是否校验耗材材质  1：高值耗材；2.普通耗材
+                if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
+                        return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+                    }
+                } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
+                        return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                    }
                 }
             }