From 87dc134c4dd8e7c2f8853e5ad6896e64b80f8414 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 31 Mar 2025 15:17:18 +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=9A=E6=96=B0=E5=A2=9E=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91cad=E6=8B=86=E5=8D=95=E6=9D=BF=E4=BB=B6=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BC=96=E5=8F=B7=E9=85=8D=E7=BD=AE=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=BD=BF=E7=94=A8cad=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/WebCadOrderImportFactory.java     | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

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 9bccccc18..183edcbc1 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
@@ -655,7 +655,7 @@ public class WebCadOrderImportFactory {
                 .backModelCount(block.getBackModelCount())
                 .offsetX(BigDecimal.valueOf(block.getOffsetX()))
                 .offsetY(BigDecimal.valueOf(block.getOffsetY()))
-                .isArcAcross(block.getIsArcBase())
+                .isArcAcross(getDefaultFalse(block.getIsArcBase()))
                 .moduleTypeId(0L)
                 .isOptimized(false)
                 .isCutted(0)
@@ -675,7 +675,7 @@ public class WebCadOrderImportFactory {
         plateDO.setUpdateTime(now);
 
         // 生成自定义板编号
-        generateCustomPlateNo(plateDO);
+        generateCustomPlateNo(plateDO, block.getCustBlockNo());
 
         WebCadDataBlockReqVO.BoadrData boardData = block.getBoardData();
         boardData.setInfo(blockInfo);
@@ -737,14 +737,20 @@ public class WebCadOrderImportFactory {
      * 生成自定义板编号
      *
      * @param plateDO
+     * @param cadCustBlockNo cad板号
      */
-    private void generateCustomPlateNo(PlateDO plateDO) {
+    private void generateCustomPlateNo(PlateDO plateDO, Integer cadCustBlockNo) {
         if (!isFirstPlate) {
             isFirstPlate = true;
         }
         // 配置不为空时，生成自定义板编号
         if (ObjectUtil.isNotNull(plateNoGenerateConfigVO)) {
             customPlateNoGenerateService.generateCustomPlateNo(orderId, plateDO, plateNoGenerateConfigVO, isFirstPlate);
+        } else {
+            // 配置为空的时候，使用cad的板编号
+            if (ObjectUtil.isNotNull(cadCustBlockNo)) {
+                plateDO.setCustomPlateNo(String.valueOf(cadCustBlockNo));
+            }
         }
     }
 
@@ -1212,7 +1218,27 @@ public class WebCadOrderImportFactory {
      * @return
      */
     private String getEmpty(String value) {
-        return StringUtils.isNotEmpty(value) ? value : EMPTY_STRING;
+        return StringUtils.defaultIfEmpty(value, EMPTY_STRING);
+    }
+
+    /**
+     * value为空返回0.0
+     *
+     * @param value
+     * @return
+     */
+    private double getZeroDouble(Double value) {
+        return ObjectUtil.defaultIfNull(value, 0.0);
+    }
+
+    /**
+     * value为空返回false
+     *
+     * @param value
+     * @return
+     */
+    private Boolean getDefaultFalse(Boolean value) {
+        return ObjectUtil.defaultIfNull(value, false);
     }
 
     /**