|
|
|
@ -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;
|
|
|
|
|