diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java index 84fcc9d6..8e4442f4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseBomVO.java @@ -90,4 +90,9 @@ public class BaseBomVO { @ApiModelProperty(value = "版本过期时间") private LocalDateTime expireEndTime; + /** + * 工厂 + */ + @ApiModelProperty(value = "工厂") + private String factory; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java index aab67811..de62556d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BatchBomService.java @@ -174,6 +174,7 @@ public class BatchBomService { baseBomVO.setExpireEndTime(parent.getExpireEndTime()); baseBomVO.setDeviseUserCode(parent.getDeviseUserCode()); baseBomVO.setDeviseName(parent.getDeviseName()); + baseBomVO.setFactory(parent.getFacCode()); Optional first = pbomChildEntities.stream().filter(item -> item.getParentRowId().equals(parent.getRowId())).findFirst(); if (first.isPresent()) { BomNewPbomChildEntity pbomChild = first.get(); @@ -539,6 +540,7 @@ public class BatchBomService { for (BaseBomVO baseBomVO: baseBomVOList) { BomNewPbomParentEntity draftParent = bomNewPbomParentService.lambdaQuery() .eq(BomNewPbomParentEntity::getMaterialNo, baseBomVO.getParentMaterialNo()) + .eq(BomNewPbomParentEntity::getFacCode, baseBomVO.getFactory()) .lt(BomNewPbomParentEntity::getStatus, PBomStatusEnum.PUBLISH.getValue()) .one(); if (ObjectUtil.isNotEmpty(draftParent)) {