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 19670ca84..5e262be5c 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -113,6 +113,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 e884f5200..d1684b3f1 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -80,4 +81,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String action; private List ids; + + /** + * 是否开启校验扫码 :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 f09e0e59d..00e31e15a 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -137,6 +137,9 @@ AND basic_udirel.purType = #{purType} + + AND basic_products.requireScanCode = #{codeCheck} + and ( nameCode LIKE concat('%', #{unionCode}, '%')