feat: 新增业务单据加上单据类型过滤物资录入

dev_test1.0
chenhc 12 months ago
parent b9794887a9
commit 6dc4bcf6d9

@ -31,6 +31,7 @@ import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.CustomerInfoService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.SupplementVailUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
@ -77,6 +78,8 @@ public class UdiRlSupController extends BaseController {
SpsSyncWebSocket webSocketServer;
@Resource
private CustomerInfoService customerInfoService;
@Resource
private IBasicBussinessTypeService basicBussinessTypeService;
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/product/relevance/filter")
@ -120,6 +123,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<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
PageInfo<UdiRlSupResponse> pageInfo;

@ -79,6 +79,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private String basicPrductRemak7;
private String basicPrductRemak8;
private String category;
private String action;
//供应商是否禁用查询条件
private Integer userFlag;

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

Loading…
Cancel
Save