|
@@ -83,7 +83,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
List<Long> skuIdList = skuSpecService.listObject(SkuSpec::getSkuId, q -> q
|
|
|
.like(StrUtil.isNotBlank(dto.getSpecCode()), SkuSpec::getCode, dto.getSpecCode())
|
|
|
.like(StrUtil.isNotBlank(dto.getSpecName()), SkuSpec::getName, dto.getSpecName()));
|
|
|
- if (skuIdList.size() == 0) {
|
|
|
+ if (skuIdList.isEmpty()) {
|
|
|
return new Page<>();
|
|
|
}
|
|
|
wrapper.in("s", Sku::getId, skuIdList);
|
|
@@ -91,7 +91,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
Page<SkuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
List<SkuVo> records = page.getRecords();
|
|
|
- if (records.size() == 0) {
|
|
|
+ if (records.isEmpty()) {
|
|
|
return page;
|
|
|
}
|
|
|
|
|
@@ -130,7 +130,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
bomSpecIdList.addAll(list.stream().map(SkuSpec::getBomSpecId).filter(ObjectUtil::isNotNull).collect(Collectors.toList()));
|
|
|
bomSpecIdList.addAll(skuSpecLinkList.stream().map(SkuSpecLink::getBomSpecId).collect(Collectors.toList()));
|
|
|
Map<Long, BomSpec> bomSpecMap = new HashMap<>();
|
|
|
- if (bomSpecIdList.size() > 0) {
|
|
|
+ if (!bomSpecIdList.isEmpty()) {
|
|
|
bomSpecMap = bomSpecService.mapKEntity(BaseIdPo::getId, q -> q.in(BaseIdPo::getId, bomSpecIdList));
|
|
|
}
|
|
|
|
|
@@ -247,7 +247,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
.eq("sslt", SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq("sslt", SkuSpecLink::getType, 1)
|
|
|
.eq("s", Sku::getCode, dto.getSkuCode())
|
|
|
- .eq("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
|
+ .like("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
|
.eq("bs", BomSpec::getCode, dto.getBomSpecCode())
|
|
|
.eq("ss", SkuSpec::getLength, dto.getLength())
|
|
|
.eq("ss", SkuSpec::getWidth, dto.getWidth())
|
|
@@ -269,7 +269,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
Page<ReplacePackagingMaterialVo> page = baseMapper.getReplacePackagingMaterialPage(dto.getPage(), wrapper);
|
|
|
List<ReplacePackagingMaterialVo> records = page.getRecords();
|
|
|
|
|
|
- if (records.size() == 0) {
|
|
|
+ if (records.isEmpty()) {
|
|
|
return page;
|
|
|
}
|
|
|
|
|
@@ -341,7 +341,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
.eq("sslt", SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq("sslt", SkuSpecLink::getType, 1)
|
|
|
.eq("s", Sku::getCode, dto.getSkuCode())
|
|
|
- .eq("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
|
+ .like("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
|
.eq("bs", BomSpec::getCode, dto.getBomSpecCode())
|
|
|
.eq("ss", SkuSpec::getLength, dto.getLength())
|
|
|
.eq("ss", SkuSpec::getWidth, dto.getWidth())
|
|
@@ -438,10 +438,10 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
}
|
|
|
|
|
|
- if (addOrEditSkuSpecLinkList.size() > 0) {
|
|
|
+ if (!addOrEditSkuSpecLinkList.isEmpty()) {
|
|
|
skuSpecLinkService.saveOrUpdateBatch(addOrEditSkuSpecLinkList);
|
|
|
}
|
|
|
- if (removeSkuSpecLinkIdList.size() > 0) {
|
|
|
+ if (!removeSkuSpecLinkIdList.isEmpty()) {
|
|
|
skuSpecLinkService.removeBatchByIds(removeSkuSpecLinkIdList);
|
|
|
}
|
|
|
|