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 5e262be5c..7afa44d29 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -106,18 +106,21 @@ public class UdiRlSupController extends BaseController { //只查找主标识产品信息 companyProductRelevanceRequest.setDiType(1); } - //包装采购类型校验 - if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())){ + //校验是否需要扫码 + if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getAction())) { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(companyProductRelevanceRequest.getAction()); //是否校验产品采购类型 :1:校验;2.无需校验 - if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){ + if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); } + //是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品 - if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { + if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) { companyProductRelevanceRequest.setCodeCheck(1); - }else if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 2) { - companyProductRelevanceRequest.setCodeCheck(2); + } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) { + companyProductRelevanceRequest.setCodeCheck(0); + } else { + companyProductRelevanceRequest.setCodeCheck(null); } } List basicInstrumentMaintainRelevanceResponses = null;