|
|
|
@ -13,10 +13,7 @@ import com.glxp.api.entity.basic.BasicUdiProductEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.ProductInfoEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.UdiCompanyEntity;
|
|
|
|
|
import com.glxp.api.entity.basic.UdiEntity;
|
|
|
|
|
import com.glxp.api.req.basic.BasicDictSelectRequest;
|
|
|
|
|
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
|
|
|
|
import com.glxp.api.req.basic.ProductInfoFilterRequest;
|
|
|
|
|
import com.glxp.api.req.basic.UdiCompanyRequest;
|
|
|
|
|
import com.glxp.api.req.basic.*;
|
|
|
|
|
import com.glxp.api.req.system.DeleteRequest;
|
|
|
|
|
import com.glxp.api.res.PageSimpleResponse;
|
|
|
|
|
import com.glxp.api.res.trace.TraceManuCodeRellResponse;
|
|
|
|
@ -143,39 +140,52 @@ public class UdiProductController extends BaseController {
|
|
|
|
|
return ResultVOUtils.success("更新成功!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("udi/basic/dict/filterylqxzcrbarmc")
|
|
|
|
|
public BaseResponse filterylqxzcrbarmc(BasicUdiProductRequest basicUdiProductRequest) {
|
|
|
|
|
|
|
|
|
|
List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterYlqxzcrbarmc(basicUdiProductRequest);
|
|
|
|
|
PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
|
|
|
|
|
PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(basicUdiProductEntities);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("udi/basic/dict/filterCpmctymc")
|
|
|
|
|
public BaseResponse filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
|
|
|
|
|
public BaseResponse filterCpmctymc(BasicUdiProductRequest basicUdiProductRequest) {
|
|
|
|
|
|
|
|
|
|
List<ProductInfoEntity> productInfoEntities = productInfoService.filterCpmctymc(productInfoFilterRequest);
|
|
|
|
|
PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
|
|
|
|
|
PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterCpmctymc(basicUdiProductRequest);
|
|
|
|
|
PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
|
|
|
|
|
PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(productInfoEntities);
|
|
|
|
|
pageSimpleResponse.setList(basicUdiProductEntities);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("udi/basic/dict/filterGgxh")
|
|
|
|
|
public BaseResponse filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) {
|
|
|
|
|
public BaseResponse filterGgxh(BasicUdiProductRequest basicUdiProductRequest) {
|
|
|
|
|
|
|
|
|
|
List<ProductInfoEntity> productInfoEntities = productInfoService.filterGgxh(productInfoFilterRequest);
|
|
|
|
|
PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
|
|
|
|
|
PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterGgxh(basicUdiProductRequest);
|
|
|
|
|
PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
|
|
|
|
|
PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(productInfoEntities);
|
|
|
|
|
pageSimpleResponse.setList(basicUdiProductEntities);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("udi/basic/dict/filterNameCode")
|
|
|
|
|
public BaseResponse filterNameCode(ProductInfoFilterRequest productInfoFilterRequest) {
|
|
|
|
|
public BaseResponse filterNameCode(BasicUdiProductRequest basicUdiProductRequest) {
|
|
|
|
|
|
|
|
|
|
List<ProductInfoEntity> productInfoEntities = productInfoService.filterNameCode(productInfoFilterRequest);
|
|
|
|
|
PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
|
|
|
|
|
PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
List<BasicUdiProductEntity> basicUdiProductEntities = basicUdiProductService.filterNameCode(basicUdiProductRequest);
|
|
|
|
|
PageInfo<BasicUdiProductEntity> pageInfo = new PageInfo<>(basicUdiProductEntities);
|
|
|
|
|
PageSimpleResponse<BasicUdiProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
|
|
|
|
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
|
|
|
|
pageSimpleResponse.setList(productInfoEntities);
|
|
|
|
|
pageSimpleResponse.setList(basicUdiProductEntities);
|
|
|
|
|
return ResultVOUtils.success(pageSimpleResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|