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

fix: 更新物料行逻辑调整

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

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

@ -964,7 +964,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
t1.setMEINS(c.getMaterialUnit()); t1.setMEINS(c.getMaterialUnit());
t1.setMENGE(c.getNum().toString()); t1.setMENGE(c.getNum().toString());
t1.setPOSTP(c.getProjectType()); t1.setPOSTP(c.getProjectType());
if (StrUtil.equals("T", c.getProjectType())) { if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(c.getProjectType())) {
t1.setIDNRK("");
t1.setPOTX1(c.getMaterialName()); t1.setPOTX1(c.getMaterialName());
} }
t1.setDATUM(dateYMD); t1.setDATUM(dateYMD);

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) { public List<BomNewDQbomVO> changeMaterial(BomNewDQbomQuery query) {
VUtils.isTure(Objects.isNull(query.getParent())).throwMessage("父级节点不能为空"); VUtils.isTure(Objects.isNull(query.getParent())).throwMessage("父级节点不能为空");
if (CollUtil.isNotEmpty(query.getDatas())) return query.getDatas();
List<String> materialNos = query.getDatas().stream() if (CollUtil.isEmpty(query.getDatas())) return query.getDatas();
.map(BomNewDQbomVO::getMaterialNo)
.filter(StrUtil::isNotBlank) initMaterialInfo(query.getDatas());
.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());
}
});
return query.getDatas(); return query.getDatas();
} }