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

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

This commit is contained in:
曹鹏飞 2024-06-24 18:02:31 +08:00
parent 3b3e98bfd9 c564a5fb92
commit e907fb4f02
2 changed files with 3 additions and 2 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/domain/OriginalBom/BaseConvert.java
View File

@ -1,6 +1,7 @@
package com.nflg.product.bomnew.service.domain.OriginalBom; package com.nflg.product.bomnew.service.domain.OriginalBom;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -117,7 +118,7 @@ public abstract class BaseConvert {
parentEntity.setMaterialDesc(material.getMaterialDesc()); parentEntity.setMaterialDesc(material.getMaterialDesc());
parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion)); parentEntity.setCurrentVersion(VersionUtil.getNextVersion(preVersion));
parentEntity.setNum(Convert.toBigDecimal(material.getQty()) ); parentEntity.setNum(Convert.toBigDecimal(material.getQty()) );
parentEntity.setBomExist(childs.isEmpty()?0:1); parentEntity.setBomExist(CollUtil.isEmpty(childs)?0:1);
parentEntity.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(material)?1:0); parentEntity.setShouldBomExist(MaterialshouldBomExistUtil.checkShouldBomExist(material)?1:0);
parentEntity.setLastVersionIs(1); parentEntity.setLastVersionIs(1);
parentEntity.setMaterialTexture(material.getMaterial()); parentEntity.setMaterialTexture(material.getMaterial());

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java
View File

@ -373,7 +373,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
eBomParent.setLastVersionIs(1); eBomParent.setLastVersionIs(1);
eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue()); eBomParent.setEditStatus(EbomEditStatusEnum.HANDLER_CREATED.getValue());
//eBomParent.setModifyTime(LocalDateTime.now()); //eBomParent.setModifyTime(LocalDateTime.now());
eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0); // eBomParent.setBomExist(parentEnt.getBomRowId() > 0 ? 1 : 0);
eBomParent.setDeviseName(SessionUtil.getRealName()); eBomParent.setDeviseName(SessionUtil.getRealName());
eBomParent.setDeptName(SessionUtil.getDepartName()); eBomParent.setDeptName(SessionUtil.getDepartName());
eBomParent.setDeviseUserCode(SessionUtil.getUserCode()); eBomParent.setDeviseUserCode(SessionUtil.getUserCode());