From 8bad71b7b897c9a2ccb3f1b376e3bda357de4153 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Thu, 14 Nov 2024 16:37:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=88=91=E4=B9=90=E5=B7=A5?=
 =?UTF-8?q?=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 修改二级品三极品缺失的情况填充一级品
---
 .../factorydata/olo/service/impl/DeliveryNoteServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
index 081d75f18..44fb95ee1 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/service/impl/DeliveryNoteServiceImpl.java
@@ -199,9 +199,9 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 					advanceDetailEntity.setFirstPackName(orderPackageDTO.getType());
 					// 获取映射志邦映射品类信息
 					// 二级品类名称
-					advanceDetailEntity.setSecondPackName(orderPackageDTO.getMaterialCategory());
+					advanceDetailEntity.setSecondPackName(StrUtil.isNotEmpty(orderPackageDTO.getMaterialCategory()) ? orderPackageDTO.getMaterialCategory() : orderPackageDTO.getType());
 					// 三级品类名称
-					advanceDetailEntity.setThirdPackName(orderPackageDTO.getMaterialCategory());
+					advanceDetailEntity.setThirdPackName(StrUtil.isNotEmpty(orderPackageDTO.getMaterialCategory()) ? orderPackageDTO.getMaterialCategory() : orderPackageDTO.getType());
 					// advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialCategory());
 
 					advanceDetailEntity.setSiteName("");