|
|
@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.sd.business.entity.bom.po.BomSpec;
|
|
|
import com.sd.business.entity.in.dto.InOutStorageBomDto;
|
|
|
import com.sd.business.entity.in.dto.InOutStorageBomSelectDto;
|
|
|
+import com.sd.business.entity.in.emums.InDetailTypeEnum;
|
|
|
import com.sd.business.entity.in.emums.InOutTypeEnum;
|
|
|
import com.sd.business.entity.in.po.InOutStorage;
|
|
|
import com.sd.business.entity.in.po.InOutStorageBom;
|
|
|
@@ -99,7 +100,18 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
|
|
|
List<InOutStorageBomVo> list = page.getRecords();
|
|
|
// 筛选吊牌、不干胶、彩纸出入库记录
|
|
|
List<String> bomCodeList = Arrays.asList("40904003", "409001", "40101010");
|
|
|
- List<InOutStorageBomVo> inOutStorageBomList = list.stream().filter(item -> !bomCodeList.contains(item.getBomSpecCode())).collect(Collectors.toList());
|
|
|
+ List<InOutStorageBomVo> inOutStorageBomList = list.stream()
|
|
|
+ .filter(item -> !bomCodeList.contains(item.getBomSpecCode()))
|
|
|
+ .filter(item -> {
|
|
|
+ // 导出入库明细，入库类型不为采购入库时。筛选掉采购入库记录
|
|
|
+ if (ObjectUtil.equals(dto.getType(), InOutTypeEnum.IN.getKey())
|
|
|
+ && ObjectUtil.notEqual(dto.getDetailType(), InDetailTypeEnum.PURCHASE.getKey())
|
|
|
+ && ObjectUtil.equals(item.getDetailType(), InDetailTypeEnum.PURCHASE.getKey())) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ })
|
|
|
+ .collect(Collectors.toList());
|
|
|
// 查询详情信息
|
|
|
Set<Long> inOutStorageIds = inOutStorageBomList.stream().map(InOutStorageBom::getInOutStorageId).collect(Collectors.toSet());
|
|
|
if (ObjectUtil.isEmpty(inOutStorageIds)) {
|
