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 2a7cef470..6667a8ec9 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -27,6 +27,7 @@ import com.glxp.api.service.basic.*; import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.BeanCopyUtils; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.SupplementVailUtil; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; @@ -64,6 +65,8 @@ public class UdiRlSupController extends BaseController { private PurApplyDetailService purApplyDetailService; @Resource SpGetHttpClient spGetHttpClient; + @Resource + private IBasicBussinessTypeService basicBussinessTypeService; @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") @@ -101,6 +104,14 @@ public class UdiRlSupController extends BaseController { //只查找主标识产品信息 companyProductRelevanceRequest.setDiType(1); } + //包装采购类型校验 + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())){ + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction()); + //是否校验产品采购类型 :1:校验;2.无需校验 + if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){ + companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); + } + } List basicInstrumentMaintainRelevanceResponses = null; basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest); PageInfo pageInfo; 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 ee4367ec4..881f9ffb4 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -77,4 +77,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String basicPrductRemak7; private String basicPrductRemak8; private String category; + private String action; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 03a751532..4a3946bf0 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -133,6 +133,9 @@ AND ggxh LIKE concat('%', #{ggxh}, '%') + + AND basic_udirel.purType = #{purType} + and ( nameCode LIKE concat('%', #{unionCode}, '%')