diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index b3aade72..360e8d62 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -1913,7 +1913,8 @@ public class PartInformationServiceImpl extends ServiceImpl routingHeaderList = routingManagementMapper.selectRoutingHeaderByPartNo(fromPart.getSite(), fromPart.getPartNo()); + saveCopyRouting(inData, fromPart, toPart, routingHeaderList); // 新增BOM if ("Manufactured Recipe".equals(toPart.getPartType())) { saveCopyRecipe(inData, fromPart, toPart, revisionMap, actualDate); @@ -1931,7 +1932,7 @@ public class PartInformationServiceImpl extends ServiceImpl routingHeaderList) { HashMap operationMap = new HashMap(); // 存放新的operationId - List routingHeaderList = routingManagementMapper.selectRoutingHeaderByPartNo(fromPart.getSite(), fromPart.getPartNo()); - List routingDetailList = routingManagementMapper.selectRoutingDetailByPartNo(fromPart.getSite(), fromPart.getPartNo()); - List routingComponentList = routingManagementMapper.selectRoutingComponentByPartNo(fromPart.getSite(), fromPart.getPartNo()); - List routingToolList = routingManagementMapper.selectRoutingToolByPartNo(fromPart.getSite(), fromPart.getPartNo()); - List routingGuidelineList = routingManagementMapper.selectRoutingGuidelineByPartNo(fromPart.getSite(), fromPart.getPartNo()); if (!routingHeaderList.isEmpty()) { for (RoutingHeaderVo routingHeader : routingHeaderList) { routingHeader.setSite(toPart.getSite()); @@ -2133,44 +2129,48 @@ public class PartInformationServiceImpl extends ServiceImpl routingDetailList = routingManagementMapper.selectRoutingDetailByPartNo(fromPart.getSite(), fromPart.getPartNo()); + List routingComponentList = routingManagementMapper.selectRoutingComponentByPartNo(fromPart.getSite(), fromPart.getPartNo()); + List routingToolList = routingManagementMapper.selectRoutingToolByPartNo(fromPart.getSite(), fromPart.getPartNo()); + List routingGuidelineList = routingManagementMapper.selectRoutingGuidelineByPartNo(fromPart.getSite(), fromPart.getPartNo()); + if (!routingDetailList.isEmpty()) { + for (RoutingDetailVo routingDetail : routingDetailList) { + routingDetail.setSite(toPart.getSite()); + routingDetail.setPartNo(toPart.getPartNo()); + routingDetail.setCreateBy(inData.getCreateBy()); + } + routingManagementMapper.saveRoutingDetailList(routingDetailList); } - routingManagementMapper.saveRoutingDetailList(routingDetailList); - } - if (!routingComponentList.isEmpty()) { - Integer oldOperationId; - for (RoutingComponentVo routingComponent : routingComponentList) { - oldOperationId = routingComponent.getOperationId(); - routingComponent.setSite(toPart.getSite()); - routingComponent.setPartNo(toPart.getPartNo()); - routingComponent.setCreateBy(inData.getCreateBy()); - routingManagementMapper.saveRoutingComponent(routingComponent); - operationMap.put(oldOperationId, routingComponent.getOperationId()); + if (!routingComponentList.isEmpty()) { + Integer oldOperationId; + for (RoutingComponentVo routingComponent : routingComponentList) { + oldOperationId = routingComponent.getOperationId(); + routingComponent.setSite(toPart.getSite()); + routingComponent.setPartNo(toPart.getPartNo()); + routingComponent.setCreateBy(inData.getCreateBy()); + routingManagementMapper.saveRoutingComponent(routingComponent); + operationMap.put(oldOperationId, routingComponent.getOperationId()); + } } - } - if (!routingToolList.isEmpty()) { - for (RoutingToolEntity routingTool : routingToolList) { - routingTool.setSite(toPart.getSite()); - routingTool.setPartNo(toPart.getPartNo()); - routingTool.setOperationId(operationMap.get(routingTool.getOperationId())); - routingTool.setCreateBy(inData.getCreateBy()); + if (!routingToolList.isEmpty()) { + for (RoutingToolEntity routingTool : routingToolList) { + routingTool.setSite(toPart.getSite()); + routingTool.setPartNo(toPart.getPartNo()); + routingTool.setOperationId(operationMap.get(routingTool.getOperationId())); + routingTool.setCreateBy(inData.getCreateBy()); + } + routingManagementMapper.saveRoutingTool(routingToolList); } - routingManagementMapper.saveRoutingTool(routingToolList); - } - if (!routingGuidelineList.isEmpty()) { - for (WorkGuidelineEntity workGuideline : routingGuidelineList) { - workGuideline.setSite(toPart.getSite()); - workGuideline.setPartNo(toPart.getPartNo()); - workGuideline.setOperationId(operationMap.get(workGuideline.getOperationId())); - workGuideline.setCreateBy(inData.getCreateBy()); + if (!routingGuidelineList.isEmpty()) { + for (WorkGuidelineEntity workGuideline : routingGuidelineList) { + workGuideline.setSite(toPart.getSite()); + workGuideline.setPartNo(toPart.getPartNo()); + workGuideline.setOperationId(operationMap.get(workGuideline.getOperationId())); + workGuideline.setCreateBy(inData.getCreateBy()); + } + routingManagementMapper.saveGuideLine(routingGuidelineList); } - routingManagementMapper.saveGuideLine(routingGuidelineList); } }