From d0e4923e8967d0a8f95b9565fa05cebf0b1b82c2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Mon, 4 Nov 2024 15:42:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E6=9E=97=E6=B0=8F=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 修改林氏家居订单数据生成暂存单品类物料信息不正确问题
---
 .../service/impl/DeliveryNoteServiceImpl.java | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
index 2e99b21fc..3f251bd72 100644
--- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
+++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/service/impl/DeliveryNoteServiceImpl.java
@@ -128,12 +128,20 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.setOrderCode(vo.getCustomizedBillCode());
 			advanceDetailEntity.setBrand(BrandEnums.LINSY.getValue());
 			advanceDetailEntity.setSystemType("线上");
-			advanceDetailEntity.setFirstPackName(orderPackageDTO.getMaterialCode());
-			// 二级品类名称
-			advanceDetailEntity.setSecondPackName(orderPackageDTO.getMaterialCode());
-			// 三级品类名称
-			advanceDetailEntity.setThirdPackName(orderPackageDTO.getMaterialCode());
-			advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialName());
+			// advanceDetailEntity.setFirstPackName(orderPackageDTO.getMaterialCode());
+			String materialName = orderPackageDTO.getMaterialName();
+			advanceDetailEntity.setFirstPackName("配件");
+			advanceDetailEntity.setSecondPackName("配件");
+			advanceDetailEntity.setThirdPackName("配件");
+			advanceDetailEntity.setMaterialName("配件");
+			if (StrUtil.isNotEmpty(materialName)) {
+				if(!StrUtil.startWith(materialName,"LSMY")){
+					advanceDetailEntity.setFirstPackName(materialName);
+					advanceDetailEntity.setSecondPackName(materialName);
+					advanceDetailEntity.setThirdPackName(materialName);
+					advanceDetailEntity.setMaterialName(materialName);
+				}
+			}
 			advanceDetailEntity.setMaterialCode(orderPackageDTO.getMaterialCode());
 			advanceDetailEntity.setSiteName(vo.getSupplierName());
 			advanceDetailEntity.setSiteCode("");