|
|
|
@ -275,9 +275,11 @@ public class CtqyyClient extends CommonHttpClient {
|
|
|
|
|
} else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) {
|
|
|
|
|
LambdaQueryWrapper<VYpzsPhysicDict> wrapper = new LambdaQueryWrapper();
|
|
|
|
|
//补充其他查询条件
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode());
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VYpzsPhysicDict::getPHYSIC_NAME, udiwmsProductRequest.getName());
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VYpzsPhysicDict::getPHYSIC_NO, udiwmsProductRequest.getRegisterNo());
|
|
|
|
|
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode())
|
|
|
|
|
.or()
|
|
|
|
|
.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getCOUNTRY_CODE, udiwmsProductRequest.getCode());
|
|
|
|
|
wrapper.like(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VYpzsPhysicDict::getPHYSIC_NAME, udiwmsProductRequest.getName());
|
|
|
|
|
wrapper.like(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VYpzsPhysicDict::getPHYSIC_NO, udiwmsProductRequest.getRegisterNo());
|
|
|
|
|
IPage<VYpzsPhysicDict> page = vYpzsPhysicDictMapper.selectPage(new Page<VYpzsPhysicDict>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper);
|
|
|
|
|
List<VYpzsPhysicDict> physicDictEntities = page.getRecords();
|
|
|
|
|
List<ThrProductsEntity> thrProductsEntityList = null;
|
|
|
|
|