From e26e91620e51411435e21438fe881abad1bf0bb9 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 25 Feb 2025 15:45:36 +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=E6=9D=BF?=
 =?UTF-8?q?=E4=BB=B6=E5=95=86=E5=93=81=E7=BC=96=E5=8F=B7=E7=BC=BA=E7=9C=81?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orderImport/factory/DefaultExcelOrderImportFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 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/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 c796c2842..128f77753 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
@@ -1076,7 +1076,7 @@ public class DefaultExcelOrderImportFactory {
             long obtainingTime = idWorker.obtainingTime();
 
             // 大板id设置到orderGoodsDO
-            String goodsId = goodsDO.getGoodsId() == null ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId();
+            String goodsId = StringUtils.isEmpty(goodsDO.getGoodsId()) ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId();
             goodsDO.setGoodsId(goodsId);
 
             plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class)