rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit

This commit is contained in:
曹鹏飞 2024-04-28 09:32:42 +08:00
parent 5e9fa2aa7e a6ee24c8c5
commit f75aae66bd
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -964,6 +964,10 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
t1.setMEINS(c.getMaterialUnit());
t1.setMENGE(c.getNum().toString());
t1.setPOSTP(c.getProjectType());
if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(c.getProjectType())) {
t1.setIDNRK("");
t1.setPOTX1(c.getMaterialName());
}
t1.setDATUM(dateYMD);
t1s.add(t1);
BomNewEbomParentEntity cp = lambdaQuery()

23
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
View File

@ -451,27 +451,10 @@ public class DQBomService {
public List<BomNewDQbomVO> changeMaterial(BomNewDQbomQuery query) {
VUtils.isTure(Objects.isNull(query.getParent())).throwMessage("父级节点不能为空");
if (CollUtil.isNotEmpty(query.getDatas())) return query.getDatas();
List<String> materialNos = query.getDatas().stream()
.map(BomNewDQbomVO::getMaterialNo)
.filter(StrUtil::isNotBlank)
.distinct()
.collect(Collectors.toList());
List<BaseMaterialVO> materialBaseInfos = materialMainService.getMaterialBaseInfo(materialNos);
query.getDatas().forEach(c -> {
BaseMaterialVO vo = materialBaseInfos.stream()
.filter(m -> m.getMaterialNo().equals(c.getMaterialNo()))
.findFirst()
.orElse(null);
if (vo != null) {
c.setUnitWeight(vo.getMaterialWeight());
c.setTotalWeight(BomUtil.calculateTotalWeight(c.getNum(), c.getUnitWeight()));
c.setMaterialName(vo.getMaterialName());
c.setMaterialUnit(vo.getMaterialUnit());
c.setMaterialTexture(vo.getMaterialTexture());
}
});
if (CollUtil.isEmpty(query.getDatas())) return query.getDatas();
initMaterialInfo(query.getDatas());
return query.getDatas();
}