diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 2f949503a..2e18459c8 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -577,7 +577,7 @@ public class WebCadOrderImportFactory { .sealRight(BigDecimal.ZERO) .sealUp(BigDecimal.ZERO) .sealDown(BigDecimal.ZERO) - .remark(block.getRemark()) + .remark(getPlateRemark(blockInfo)) .deleted(false) .organId(organId) .build(); @@ -619,6 +619,29 @@ public class WebCadOrderImportFactory { analyzeBlockProcessGroup(orderBodyDO, block, plateId); } + /** + * 获取板件备注 + * + * @param infoDTO + * @return + */ + private String getPlateRemark(WebCadDataBlockReqVO.InfoDTO infoDTO) { + if (ObjectUtil.isNull(infoDTO)) { + return EMPTY_STRING; + } + + List> remarks = infoDTO.getRemarks(); + if (CollUtil.isEmpty(remarks)) { + return EMPTY_STRING; + } + + return remarks.stream() + .filter(remark -> CollUtil.isNotEmpty(remark) && remark.size() == 2) + .filter(remark -> !"#extra".equals(remark.get(0)) && !"#drills".equals(remark.get(0))) + .map(remark -> remark.get(1)) + .collect(Collectors.joining(",")); + } + /** * 生成自定义板编号 *