From 77ff867e86dba5084c29ea3ca911ef97aa16f331 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 14 Mar 2025 20:56:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9Awebcad=E6=8B=86=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=AD=A3=E6=9D=BF=E4=BB=B6=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/WebCadOrderImportFactory.java     | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

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<List<String>> 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(","));
+    }
+
     /**
      * 生成自定义板编号
      *