|
@@ -126,8 +126,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
result.setSkuSpecList(skuSpecList);
|
|
|
|
|
|
// sku规格关联
|
|
|
- List<SkuSpecLink> skuSpecLinkList = skuSpecLinkService.list(
|
|
|
- q -> q.eq(SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId()).eq(SkuSpecLink::getSkuId, id));
|
|
|
+ List<SkuSpecLink> skuSpecLinkList = skuSpecLinkService.list(q -> q.eq(SkuSpecLink::getSkuId, id));
|
|
|
|
|
|
// sku规格关联map
|
|
|
Map<Long, Map<Integer, List<SkuSpecLink>>> map = skuSpecLinkList.stream().collect(
|
|
@@ -253,7 +252,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
public Page<ReplacePackagingMaterialVo> getReplacePackagingMaterialPage(GetReplaceMaterialListDto dto) {
|
|
|
|
|
|
IWrapper<Object> wrapper = IWrapper.getWrapper()
|
|
|
- .eq("sslt", SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq("sslt", SkuSpecLink::getType, 1)
|
|
|
.eq("s", Sku::getCode, dto.getSkuCode())
|
|
|
.like("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
@@ -262,19 +260,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
.eq("ss", SkuSpec::getWidth, dto.getWidth())
|
|
|
.eq("ss", SkuSpec::getHeight, dto.getHeight());
|
|
|
|
|
|
- Long deptId = SecurityUtils.getDeptId();
|
|
|
- Department department = departmentService.getById(deptId);
|
|
|
- if (department == null) {
|
|
|
- throw new ServiceException("非事业部账号无法替换包材");
|
|
|
- }
|
|
|
-
|
|
|
- if (StrUtil.isNotBlank(department.getWlnBrand())) {
|
|
|
- List<String> brandList = Arrays.asList(department.getWlnBrand().split(","));
|
|
|
- wrapper.in("s", Sku::getBrand, brandList);
|
|
|
- } else {
|
|
|
- return new Page<>();
|
|
|
- }
|
|
|
-
|
|
|
Page<ReplacePackagingMaterialVo> page = baseMapper.getReplacePackagingMaterialPage(dto.getPage(), wrapper);
|
|
|
List<ReplacePackagingMaterialVo> records = page.getRecords();
|
|
|
|
|
@@ -286,7 +271,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
List<SkuSpecLink> skuSpecLinkList = skuSpecLinkService.list(q -> q
|
|
|
.in(SkuSpecLink::getSkuSpecId, skuSpecIdList)
|
|
|
- .eq(SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq(SkuSpecLink::getType, 1));
|
|
|
|
|
|
Map<Long, List<SkuSpecLink>> map = skuSpecLinkList.stream().collect(Collectors.groupingBy(SkuSpecLink::getSkuSpecId));
|
|
@@ -347,7 +331,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
public void replacePackagingMaterial(ReplacePackagingMaterialDto dto) {
|
|
|
|
|
|
IWrapper<Object> wrapper = IWrapper.getWrapper()
|
|
|
- .eq("sslt", SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq("sslt", SkuSpecLink::getType, 1)
|
|
|
.eq("s", Sku::getCode, dto.getSkuCode())
|
|
|
.like("ss", SkuSpec::getCode, dto.getSkuSpecCode())
|
|
@@ -356,19 +339,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
.eq("ss", SkuSpec::getWidth, dto.getWidth())
|
|
|
.eq("ss", SkuSpec::getHeight, dto.getHeight());
|
|
|
|
|
|
- Long deptId = SecurityUtils.getDeptId();
|
|
|
- Department department = departmentService.getById(deptId);
|
|
|
- if (department == null) {
|
|
|
- throw new ServiceException("非事业部账号无法替换包材");
|
|
|
- }
|
|
|
-
|
|
|
- if (StrUtil.isNotBlank(department.getWlnBrand())) {
|
|
|
- List<String> brandList = Arrays.asList(department.getWlnBrand().split(","));
|
|
|
- wrapper.in("s", Sku::getBrand, brandList);
|
|
|
- } else {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
List<ReplacePackagingMaterialVo> list = baseMapper.getReplacePackagingMaterialList(wrapper);
|
|
|
|
|
|
if (list.isEmpty()) {
|
|
@@ -377,10 +347,8 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
List<Long> skuSpecIdList = list.stream().map(ReplacePackagingMaterialVo::getSkuSpecId).collect(Collectors.toList());
|
|
|
|
|
|
- List<SkuSpecLink> skuSpecLinkList = skuSpecLinkService.list(q -> q
|
|
|
- .in(SkuSpecLink::getSkuSpecId, skuSpecIdList)
|
|
|
- .eq(SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
- .eq(SkuSpecLink::getType, 1));
|
|
|
+ List<SkuSpecLink> skuSpecLinkList = skuSpecLinkService.list(q ->
|
|
|
+ q.in(SkuSpecLink::getSkuSpecId, skuSpecIdList).eq(SkuSpecLink::getType, 1));
|
|
|
|
|
|
Map<Long, List<SkuSpecLink>> map = skuSpecLinkList.stream().collect(Collectors.groupingBy(SkuSpecLink::getSkuSpecId));
|
|
|
|
|
@@ -407,7 +375,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
skuSpecLink.setSkuId(record.getSkuId());
|
|
|
skuSpecLink.setSkuSpecId(record.getSkuSpecId());
|
|
|
skuSpecLink.setBomSpecId(replaceBomSpecId);
|
|
|
- skuSpecLink.setDepartmentId(SecurityUtils.getDeptId());
|
|
|
skuSpecLink.setType(1);
|
|
|
skuSpecLink.setQuantity(BigDecimal.ONE);
|
|
|
addOrEditSkuSpecLinkList.add(skuSpecLink);
|
|
@@ -439,7 +406,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
skuSpecLink.setSkuId(record.getSkuId());
|
|
|
skuSpecLink.setSkuSpecId(record.getSkuSpecId());
|
|
|
skuSpecLink.setBomSpecId(replaceBomSpecId);
|
|
|
- skuSpecLink.setDepartmentId(SecurityUtils.getDeptId());
|
|
|
skuSpecLink.setType(1);
|
|
|
skuSpecLink.setQuantity(BigDecimal.ONE);
|
|
|
addOrEditSkuSpecLinkList.add(skuSpecLink);
|
|
@@ -470,7 +436,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
skuSpecLinkService.remove(q -> q
|
|
|
.eq(SkuSpecLink::getBomSpecId, bomSpec.getId())
|
|
|
- .eq(SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.eq(SkuSpecLink::getType, 1));
|
|
|
|
|
|
}
|
|
@@ -546,7 +511,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
|
|
|
skuSpecLinkService.remove(q -> q
|
|
|
.eq(SkuSpecLink::getSkuId, skuId)
|
|
|
- .eq(SkuSpecLink::getDepartmentId, SecurityUtils.getDeptId())
|
|
|
.notIn(ObjectUtil.isNotEmpty(skuSpecLinkIdList), BaseIdPo::getId, skuSpecLinkIdList));
|
|
|
|
|
|
List<SkuSpecLink> skuSpecLinkList = createSkuSpecLink(skuSpecDtoList);
|
|
@@ -565,7 +529,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
for (SkuSpecLink skuSpecLink : packagingMaterialList) {
|
|
|
skuSpecLink.setSkuId(item.getSkuId());
|
|
|
skuSpecLink.setSkuSpecId(item.getId());
|
|
|
- skuSpecLink.setDepartmentId(SecurityUtils.getDeptId());
|
|
|
skuSpecLink.setType(1);
|
|
|
}
|
|
|
|
|
@@ -573,7 +536,6 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
|
|
|
for (SkuSpecLink skuSpecLink : expressPackingList) {
|
|
|
skuSpecLink.setSkuId(item.getSkuId());
|
|
|
skuSpecLink.setSkuSpecId(item.getId());
|
|
|
- skuSpecLink.setDepartmentId(SecurityUtils.getDeptId());
|
|
|
skuSpecLink.setType(2);
|
|
|
}
|
|
|
|