From d05b09ead4626f5e3dbb3a1f1ae86f74e727cdd2 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Tue, 2 Jul 2024 13:55:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=9E=97?=
 =?UTF-8?q?=E6=B0=8F=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E4=BF=A1=E6=81=AF=E5=8F=96=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeliveryNoteServiceImpl.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 ff1a5743b..47e705a7e 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
@@ -127,11 +127,11 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.setOrderCode(vo.getBillCode());
 			advanceDetailEntity.setBrand(BrandEnums.LINSY.getValue());
 			advanceDetailEntity.setSystemType("线上");
-			advanceDetailEntity.setFirstPackName("板件");
+			advanceDetailEntity.setFirstPackName(orderPackageDTO.getMaterialCode());
 			// 二级品类名称
-			advanceDetailEntity.setSecondPackName("板件");
+			advanceDetailEntity.setSecondPackName(orderPackageDTO.getMaterialCode());
 			// 三级品类名称
-			advanceDetailEntity.setThirdPackName("板件");
+			advanceDetailEntity.setThirdPackName(orderPackageDTO.getMaterialCode());
 			advanceDetailEntity.setMaterialName(orderPackageDTO.getMaterialName());
 			advanceDetailEntity.setMaterialCode(orderPackageDTO.getMaterialCode());
 			advanceDetailEntity.setSiteName(vo.getSupplierName());
@@ -250,10 +250,10 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 		advance.set("senderAddress", vo.getSenderDetailAddress());
 		advance.set("create_time", DateUtil.now());
 		advance.set("update_time", DateUtil.now());
-		advance.set("firstPackName", "板件");
 
 		JSONArray packageList = new JSONArray();
 		for (PackageInfoVO orderPackageDTO : packages) {
+			advance.set("firstPackName", orderPackageDTO.getMaterialCode());
 			// advance.set("firstPackCode", orderPackageDTO.getMaterialCode());
 			// 封装包件
 			JSONObject advanceDetailEntity = new JSONObject();
@@ -261,11 +261,11 @@ public class DeliveryNoteServiceImpl extends BaseServiceImpl<DeliveryNoteMapper,
 			advanceDetailEntity.set("serviceNum", vo.getCustomizedBillCode());
 			advanceDetailEntity.set("type", BrandEnums.LINSY.getValue());
 			advanceDetailEntity.set("systemType", "线上");
-			advanceDetailEntity.set("firstPackName", "板件");
+			advanceDetailEntity.set("firstPackName", orderPackageDTO.getMaterialCode());
 			// 二级品类名称
-			advanceDetailEntity.set("secondPackName", "板件");
+			advanceDetailEntity.set("secondPackName", orderPackageDTO.getMaterialCode());
 			// 三级品类名称
-			advanceDetailEntity.set("thirdPackName", "板件");
+			advanceDetailEntity.set("thirdPackName", orderPackageDTO.getMaterialCode());
 			// advanceDetailEntity.set("firstPackCode", orderPackageDTO.getMaterialCode());
 			// advanceDetailEntity.set("secondPackCode", orderPackageDTO.getMaterialCode());
 			// advanceDetailEntity.set("thirdPackCode", orderPackageDTO.getMaterialCode());