feat: 0702-扫码校验功能

dev_ksck_axxyy
chenhc 1 year ago
parent a13a3b9fab
commit 9a573b35af

@ -133,6 +133,12 @@ public class UdiRlSupController extends BaseController {
if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
companyProductRelevanceRequest.setPurType(IntUtil.value(bussinessTypeEntity.getActionType())); 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<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null; List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest); basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);

@ -92,5 +92,9 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
*/ */
private Integer vailHcType; private Integer vailHcType;
/**
* 0:1:2:
*/
@TableField(value = "codeCheck")
private Integer codeCheck;
} }

@ -148,6 +148,9 @@
<if test="purType != '' and purType != null"> <if test="purType != '' and purType != null">
AND basic_udirel.purType = #{purType} AND basic_udirel.purType = #{purType}
</if> </if>
<if test="codeCheck != '' and codeCheck != null">
AND basic_products.requireScanCode = #{codeCheck}
</if>
<if test="unionCode != '' and unionCode != null"> <if test="unionCode != '' and unionCode != null">
and ( and (
nameCode LIKE concat('%', #{unionCode}, '%') nameCode LIKE concat('%', #{unionCode}, '%')

Loading…
Cancel
Save