diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/persistence/MaterialBaseInfoImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/persistence/MaterialBaseInfoImpl.java index 61158a587..19ff6d760 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/persistence/MaterialBaseInfoImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/persistence/MaterialBaseInfoImpl.java @@ -1,6 +1,7 @@ package com.mhd.basic.domain.materialBaseInfo.repository.persistence; import cn.hutool.json.JSONUtil; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mhd.basic.domain.batch.entity.Batch; @@ -14,7 +15,7 @@ import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.WmsServiceFeign; -import com.mhd.system.api.domain.MaterialBaseInfoFeign; +import com.mhd.system.api.domain.*; import com.mhd.system.api.model.LoginUser; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 物料基础信息Service业务层处理 @@ -87,8 +89,7 @@ public class MaterialBaseInfoImpl extends ServiceImpl copyMaterialInventoryWarningList(List sourceList) { + if (CollectionUtils.isEmpty(sourceList)) { + return null; + } + return sourceList.stream() + .map(source -> { + MaterialInventoryWarningFeign target = new MaterialInventoryWarningFeign(); + BeanUtils.copyProperties(source, target); + return target; + }) + .collect(Collectors.toList()); + } + + /** + * 深拷贝条码列表 + */ + private List copyMaterialBarCodeList(List sourceList) { + if (CollectionUtils.isEmpty(sourceList)) { + return null; + } + return sourceList.stream() + .map(source -> { + MaterialBarCodeFeign target = new MaterialBarCodeFeign(); + BeanUtils.copyProperties(source, target); + return target; + }) + .collect(Collectors.toList()); + } + + /** + * 批量转换(如果有需要) + */ + public List toFeignList(List sourceList) { + if (CollectionUtils.isEmpty(sourceList)) { + return null; + } + return sourceList.stream() + .map(this::toFeign) + .collect(Collectors.toList()); + } + /** * @description 校验唯一 * @author ZhouGY