diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java index 0ae13844..619a81dc 100644 --- a/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/part/service/impl/QuicklyCreateBomServiceImpl.java @@ -336,7 +336,7 @@ public class QuicklyCreateBomServiceImpl implements QuicklyCreateBomService { } // 创建该物料的bom默认版本 - if (!"Purchased (raw)".equals(data.getPartType2())) { // 该类型不创建BOM + if (!"Purchased (raw)".equals(data.getPartType2())&&!"Y".equals(data.getBomFlag())) { // 该类型不创建BOM // 校验查重 BomHeaderEntity bomHeader = new BomHeaderEntity(); bomHeader.setSite(data.getSite()); @@ -359,7 +359,7 @@ public class QuicklyCreateBomServiceImpl implements QuicklyCreateBomService { bomDetail.setStatus("Tentative"); bomManagementMapper.bomDetailSave(bomDetail); // 新增 Routing - if (data.getPartType2().contains("Manufactured")) { + if (data.getPartType2().contains("Manufactured")&&!"Y".equals(data.getRoutingFlag())) { RoutingHeaderEntity headerEntity = new RoutingHeaderEntity(); headerEntity.setSite(data.getSite()); headerEntity.setBuNo(data.getBuNo()); diff --git a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java index 54773f09..e276ca5f 100644 --- a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java +++ b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java @@ -130,4 +130,6 @@ public class PartInformationVo extends PartInformationEntity { private Long parentId; private Integer routingRevision; private String mainPart; + private String bomFlag; + private String routingFlag; }