From 4643194820405f2260e7adc6b29bdb2a8fa0e342 Mon Sep 17 00:00:00 2001 From: luoliming Date: Sat, 25 May 2024 14:54:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=981?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java | 3 +++ .../service/domain/OriginalBom/PlmBomToOriginalConvertV2.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java index dc60026d..3cb512fb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomOriginalListVO.java @@ -195,6 +195,9 @@ public class BomOriginalListVO extends BaseMaterialVO { @ApiModelProperty("是否通过规则替换 0-否 1-是") private Integer regReplaceIs; + @ApiModelProperty("项目类别输入方式: 0-自动匹配 1-手工录入 2-来自物料主数据 3-来自历史统计") + private Integer projectTypeInputType=1; + public Integer getVirtualPartType() { if( drawingNo.contains(VirtualPackageTypeEnum.DELIVERY_PACKAGE.getConMaterialName())){ return VirtualPackageTypeEnum.DELIVERY_PACKAGE.getValue(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java index f951ef59..48b5db6c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/PlmBomToOriginalConvertV2.java @@ -62,7 +62,7 @@ public class PlmBomToOriginalConvertV2 extends BaseConvert { //初始化物料信息 SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(ImmutableList.of(parent), "material", "materialTexture", "materialUnit"); - SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(childs, "material", "materialTexture", "materialUnit"); + SpringUtil.getBean(MaterialMainService.class).intiMaterialInfo(childs, "material", "materialTexture", "materialUnit","projectType"); SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(ImmutableList.of(parent), BomOriginalPlmBomVO::getMaterialCategoryCode, BomOriginalPlmBomVO::setShouldBomExist, BomOriginalPlmBomVO::getMaterialGetType); SpringUtil.getBean(MaterialMainService.class).initShouldBomExist(childs, BomOriginalPlmBomVO::getMaterialCategoryCode, BomOriginalPlmBomVO::setShouldBomExist, BomOriginalPlmBomVO::getMaterialGetType); From ab1449e3f0fc5e0f5c66d37bbcc62a0655e22cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 25 May 2024 15:01:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(ebom):=20=E5=88=A0=E9=99=A4ebom?= =?UTF-8?q?=E6=97=B6=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E8=99=9A=E6=8B=9F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/service/domain/EBom/EBomDel.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java index 069eba7f..885e8900 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomDel.java @@ -8,15 +8,16 @@ import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.EBomSourceEnum; import com.nflg.product.bomnew.constant.UserJobEnum; +import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum; import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; import com.nflg.product.bomnew.service.BomNewEbomParentService; import com.nflg.product.bomnew.service.UserRoleService; import com.nflg.product.bomnew.util.VUtils; import lombok.Getter; -import org.apache.tomcat.jni.User; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -52,16 +53,20 @@ public class EBomDel { //工艺岗位，只能删除自己在EBOM中创建的数据 // 原始bom导入过来的只能 设计人员自己删，工艺不能删;双角色可以删自己数据 //设计人员在Ebom中创建的数据 工艺人员可以删除？ + //虚拟包可以删除 if(roleList.contains(EBomConstant.DESIGNER)){ - delEBom = bomTreeAll.stream().filter(u ->ObjectUtil.equal( u.getCreatedBy(),SessionUtil.getUserCode()) - && (ObjectUtil.equal(u.getSource(),EBomSourceEnum.FROM_MDM.getValue()) || ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_EXCE.getValue() ))) + delEBom = bomTreeAll.stream().filter(u -> (ObjectUtil.equal(u.getCreatedBy(), SessionUtil.getUserCode()) + && (ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_MDM.getValue()) || ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_EXCE.getValue())) + ) || !Objects.equals(u.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue())) .collect(Collectors.toList()); } //工艺 删除自己和设计人员的数据只能是excel和手动录入 + //虚拟包可以删除 if(roleList.contains(EBomConstant.TECHNICIAN)){ - delEBom = bomTreeAll.stream().filter(u -> (ObjectUtil.equal(UserJobEnum.DESIGNER.getValue(),u.getCreatedJob()) || ObjectUtil.equal(u.getCreatedBy(),SessionUtil.getUserCode())) - && ( ObjectUtil.equal(u.getSource(),EBomSourceEnum.FROM_MDM.getValue()) || ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_EXCE.getValue() ))) + delEBom = bomTreeAll.stream().filter(u -> ((ObjectUtil.equal(UserJobEnum.DESIGNER.getValue(), u.getCreatedJob()) || ObjectUtil.equal(u.getCreatedBy(), SessionUtil.getUserCode())) + && (ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_MDM.getValue()) || ObjectUtil.equal(u.getSource(), EBomSourceEnum.FROM_EXCE.getValue())) + ) || !Objects.equals(u.getVirtualPartType(), VirtualPackageTypeEnum.UN_VIRTUAL_PACKAGE.getValue())) .collect(Collectors.toList()); }