From dca978a281c275daeade59ad448447be18e07d7b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 Jan 2025 20:00:02 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/impl/EmisWaybillServiceImpl.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 98222e315..2e87460f2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -4170,6 +4170,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
                 if(!CollectionUtils.isEmpty(declareGoodsList)){
                     for (EmisWaybillDeclareGoods itemGoods:declareGoodsList) {
+                        if(StringUtils.isEmpty(itemGoods.getGoodsName())){
+                            itemGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
+                        }
+
                         if(itemGoods.getCargoQty()!=null) {
                             itemGoods.setCargoQty(new BigDecimal(itemGoods.getCargoQty().stripTrailingZeros().toPlainString()));
                         }
@@ -4358,6 +4362,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 if(!CollectionUtils.isEmpty(declareGoodsList)){
                     for (EmisWaybillDeclareGoods itemGoods:declareGoodsList) {
 
+                        if(StringUtils.isEmpty(itemGoods.getGoodsName())){
+                            itemGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
+                        }
+
+
                         if(itemGoods.getCargoQty()!=null) {
                             itemGoods.setCargoQty(new BigDecimal(itemGoods.getCargoQty().stripTrailingZeros().toPlainString()));
                         }