feat: 0606注释掉是否需要扫码

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

@@ -4,6 +4,7 @@ import com.glxp.api.annotation.CusRedissonAnnotation;
 import com.glxp.api.constant.*;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.impl.InvProductDetailService;
 import org.springframework.beans.BeanUtils;
@@ -398,7 +399,15 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        if (udiInfoEntity.getRequireScanCode() == 1){
+//        if (bussinessTypeEntity.getRequireScanCode() == 1) {
+//            if (udiInfoEntity.getRequireScanCode() != 1){
+//                return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！");
+//            }
+//        }else if (bussinessTypeEntity.getRequireScanCode() == 0){
+//            if (udiInfoEntity.getRequireScanCode() != 0){
+//                return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！");
+//            }
+//        }
             //是否校验耗材材质  1：高值耗材；2.普通耗材
             if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                 if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
@@ -409,7 +418,6 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                 }
             }
-        }
 
 
         String orderId = addOrderRequest.getBillNo();

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

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

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -505,4 +505,10 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "devInType")
     private Integer devInType;
 
+    /**
+     * 是否需要扫码 ：0：不需要；1.需要
+     */
+    @TableField(value = "requireScanCode")
+    private Integer requireScanCode;
+
 }

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

@@ -290,7 +290,18 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
                 }
             }
 
-            if (udiRelevanceResponse.getRequireScanCode() == 1){
+//            if (bussinessTypeEntity.getCheckVailDate() != 4) {
+//                if (bussinessTypeEntity.getRequireScanCode() == 1) {
+//                    if (udiRelevanceResponse.getRequireScanCode() != 1){
+//                        throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！");
+//                    }
+//                }else if (bussinessTypeEntity.getRequireScanCode() == 0){
+//                    if (udiRelevanceResponse.getRequireScanCode() != 0){
+//                        throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！");
+//                    }
+//                }
+//            }
+
                 //是否校验耗材材质  1：高值耗材；2.普通耗材
                 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@@ -301,7 +312,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
                         throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！");
                     }
                 }
-            }
 
 
             if (udiRelevanceResponse.getPurType() == 2) {

src/main/resources/schemas/schema_v2.4.sql

@@ -3691,3 +3691,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
                          1);
 
 INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode',
+                         'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
+                         1);