From 08872048371351015fddb7bc708f875d38f84eaf Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 26 Feb 2025 18:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95excel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E4=B8=BA=E7=A9=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/factory/DefaultExcelOrderImportFactory.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
index bd479a4dc..3b48c4c0e 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java
@@ -936,7 +936,7 @@ public class DefaultExcelOrderImportFactory {
                 .colorBlack(EMPTY_STRING)
                 .price(0.00)
                 .thickness(Double.valueOf(groupDO.getThickness()))
-                .spec(groupDO.getSpec())
+                .spec(StringUtils.isNotEmpty(groupDO.getSpec()) ? groupDO.getSpec() : EMPTY_STRING)
                 .brand(StringUtils.isNotEmpty(groupDO.getBrand()) ? groupDO.getBrand() : EMPTY_STRING)
                 .deleted(false)
                 .build();
@@ -966,7 +966,7 @@ public class DefaultExcelOrderImportFactory {
                 .width(BigDecimal.valueOf(NumberUtil.parseDouble(groupDO.getWidth())))
                 .height(BigDecimal.valueOf(NumberUtil.parseDouble(groupDO.getHeight())))
                 .thickness(BigDecimal.valueOf(Double.valueOf(groupDO.getThickness())))
-                .spec(groupDO.getSpec())
+                .spec(StringUtils.isNotEmpty(groupDO.getSpec()) ? groupDO.getSpec() : EMPTY_STRING)
                 .brand(StringUtils.isNotEmpty(groupDO.getBrand()) ? groupDO.getBrand() : EMPTY_STRING)
                 .planId(0L)
                 .colorBlack(EMPTY_STRING)
@@ -1004,7 +1004,7 @@ public class DefaultExcelOrderImportFactory {
                 .name(groupDO.getGoodsName())
                 .material(groupDO.getMaterial())
                 .model(StringUtils.isNotEmpty(groupDO.getModel()) ? groupDO.getModel() : EMPTY_STRING)
-                .spec(groupDO.getSpec())
+                .spec(StringUtils.isNotEmpty(groupDO.getSpec()) ? groupDO.getSpec() : EMPTY_STRING)
                 .brand(StringUtils.isNotEmpty(groupDO.getBrand()) ? groupDO.getBrand() : EMPTY_STRING)
                 .factory(StringUtils.isNotEmpty(groupDO.getFactory()) ? groupDO.getFactory() : EMPTY_STRING)
                 .unit(groupDO.getUnit()).price(0.0)