feat: 0702-扫码校验功能

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

@@ -419,6 +419,17 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
                 }
             }
+
+            //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+            if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){
+                if (IntUtil.value(udiInfoEntity.getRequireScanCode()) != 1) {
+                    return ResultVOUtils.error(500, "单据只允许录入需要扫码产品" + ",请检查后重试！");
+                }
+            }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) {
+                if (IntUtil.value(udiInfoEntity.getHcType()) != 0) {
+                    return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！");
+                }
+            }
         }
 
 

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

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

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

@@ -511,4 +511,11 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "requireScanCode")
     private Integer requireScanCode;
 
+    /**
+     * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+     */
+    @TableField(value = "codeCheck")
+    private Integer codeCheck;
+
+
 }

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -335,4 +335,11 @@ public class BussinessTypeSaveRequest {
     @TableField(value = "devInType")
     private Integer devInType;
 
+    /**
+     * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+     */
+    @TableField(value = "codeCheck")
+    private Integer codeCheck;
+
+
 }

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -217,4 +217,10 @@ public class BasicBussinessTypeResponse {
     @TableField(value = "devInType")
     private Integer devInType;
 
+    /**
+     * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+     */
+    @TableField(value = "codeCheck")
+    private Integer codeCheck;
+
 }

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

@@ -310,7 +310,18 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
                     }
                 } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
                     if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
-                        throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！");
+                        throw new JsonException("单据只允许录入普通耗材" + ",请检查后重试！");
+                    }
+                }
+
+                //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
+                if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){
+                    if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) {
+                        throw new JsonException("单据只允许录入需要扫码产品" + ",请检查后重试！");
+                    }
+                }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) {
+                    if (IntUtil.value(udiRelevanceResponse.getHcType()) != 0) {
+                        throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试！");
                     }
                 }
             }

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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

@@ -3711,6 +3711,10 @@ CALL Pro_Temp_ColumnWork('device_check_item_dict', 'updateTime',
                          ' datetime NULL DEFAULT NULL COMMENT ''更新时间''',
                          1);
 
+
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck',
+                         'tinyint    NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''', 1);
+
 CALL Pro_Temp_ColumnWork('basic_products', 'bzgg',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''',
                          1);