|
|
@@ -1130,7 +1130,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
result += 1;
|
|
|
}
|
|
|
aProduct.setBrandEnByExcel(brandValue);
|
|
|
- // pcb模块判断类目是否为商城标准品牌
|
|
|
+ // pcb模块判断类目是否为商城标准品牌,是则补充标准品牌信息
|
|
|
if (isPcb && !StringUtils.isEmpty(aProduct.getBrandNameEn())) {
|
|
|
List<BrandInfo> brandInfos = brandInfoDao.findByName(aProduct.getBrandNameEn());
|
|
|
if (CollectionUtils.isNotEmpty(brandInfos)) {
|
|
|
@@ -1139,8 +1139,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
|
|
|
aProduct.setBranduuid(brandInfo.getUuid());
|
|
|
aProduct.setBrandId(brandInfo.getId());
|
|
|
}
|
|
|
- } else {
|
|
|
- aProduct.addErrmsg(ErrorInfoConstant.BRAND_UNSTANDARD.getInfo());
|
|
|
}
|
|
|
}
|
|
|
|