feat: 0604增加是否需要扫码字段

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -398,14 +398,16 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        //是否校验耗材材质  1：高值耗材；2.普通耗材
+        if (udiInfoEntity.getRequireScanCode() == 1){
-        if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+            //是否校验耗材材质  1：高值耗材；2.普通耗材
-            if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
+            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
-                return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+                if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
-            }
+                    return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
-        } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                }
-            if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
+            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
-                return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
+                    return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                }
             }
         }
 

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -219,17 +219,19 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
-
+            if (udiRelevanceResponse.getRequireScanCode() == 1) {
-            //是否校验耗材材质  1：高值耗材；2.普通耗材
+                    //是否校验耗材材质  1：高值耗材；2.普通耗材
-            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+                if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
-                    return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+                        return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
-                }
+                    }
-            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
-                    return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                        return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                    }
                 }
             }
+
 //            todo 查询产品是否已经通过认证
 //            BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
 //            if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -289,17 +289,21 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
                     throw new JsonException("单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！");
                 }
             }
-            //是否校验耗材材质  1：高值耗材；2.普通耗材
+
-            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+            if (udiRelevanceResponse.getRequireScanCode() == 1){
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
+                //是否校验耗材材质  1：高值耗材；2.普通耗材
-                    throw new JsonException("单据只允许录入高值耗材" + ",请检查后重试！");
+                if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
-                }
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
-            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                        throw new JsonException("单据只允许录入高值耗材" + ",请检查后重试！");
-                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
+                    }
-                    throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！");
+                } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
+                        throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！");
+                    }
                 }
             }
 
+
             if (udiRelevanceResponse.getPurType() == 2) {
                 if (StrUtil.isEmpty(item.getZczbhhzbapzbh())) {
                     throw new JsonException("预验收产品必须填写预验收批次号");