diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 81239057..4eeaafba 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -133,6 +133,12 @@ public class UdiRlSupController extends BaseController { if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); } + //是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品 + if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { + companyProductRelevanceRequest.setCodeCheck(1); + }else if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 2) { + companyProductRelevanceRequest.setCodeCheck(2); + } } List basicInstrumentMaintainRelevanceResponses = null; basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest); diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 6ac8ef3c..4b7ba045 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -92,5 +92,9 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { */ private Integer vailHcType; - + /** + * 是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品 + */ + @TableField(value = "codeCheck") + private Integer codeCheck; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index e2d67424..fa39a71d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -148,6 +148,9 @@ AND basic_udirel.purType = #{purType} + + AND basic_products.requireScanCode = #{codeCheck} + and ( nameCode LIKE concat('%', #{unionCode}, '%')