From 49cdf1dc97d904b19d7365ad10b788fbfb6e37ce Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 29 Jan 2024 18:23:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=BC=80=E5=8D=95=E5=88=9B=E5=BB=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A5=E5=85=A8=202.=E5=AF=BC=E5=85=A5=E5=95=86?=
 =?UTF-8?q?=E5=9C=BA=E6=94=B6=E8=B4=A7=E4=BA=BA=E4=BF=A1=E6=81=AF=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/trunkline/entity/TrunklineAdvanceEntity.java | 10 ++++++++++
 .../trunkline/service/impl/OpenOrderServiceImpl.java   | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java
index 8e3597646..b4e7a16b2 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineAdvanceEntity.java
@@ -125,4 +125,14 @@ public class TrunklineAdvanceEntity extends TenantEntity {
 	@ApiModelProperty(name = "发货工厂",notes = "")
 	private String senderFactory ;
 
+	@ApiModelProperty(name = "商场收货人",notes = "")
+	private String consigneePerson;
+
+	@ApiModelProperty(name = "商场收货人电话",notes = "")
+	private String consigneeMobile;
+
+	@ApiModelProperty(name = "商场收货地址",notes = "")
+	private String consigneeAddress;
+
+
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 4dd3c0eea..7d657cd7e 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -348,6 +348,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						goodsId = basicdataCategoryEntity.getId();
 					}
 				}
+				warehouseWayBillDetail.setCreateUser(AuthUtil.getUserId());
+				warehouseWayBillDetail.setUpdateUser(AuthUtil.getUserId());
+				Date date = new Date();
+				warehouseWayBillDetail.setCreateTime(date);
+				warehouseWayBillDetail.setUpdateTime(date);
+				warehouseWayBillDetail.setStatus(1);
+				warehouseWayBillDetail.setIsDeleted(0);
 				warehouseWayBillDetail.setProductId(goodsId);
 				warehouseWayBillDetail.setProductName(goodsName);
 				warehouseWayBillDetail.setNum(waybillDetailDTO.getNum());
@@ -900,6 +907,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceEntity.setPackName(firsts);
 				advanceEntity.setDealerCode(pacakgeDetailExcelDTO.getDealerCode());
 				advanceEntity.setDealerName(pacakgeDetailExcelDTO.getDealerName());
+				advanceEntity.setConsigneePerson(pacakgeDetailExcelDTO.getConsigneePerson());
+				advanceEntity.setConsigneeMobile(pacakgeDetailExcelDTO.getConsigneeMobile());
+				advanceEntity.setConsigneeAddress(pacakgeDetailExcelDTO.getConsigneeAddress());
 				advanceEntity.setCustomerName(pacakgeDetailExcelDTO.getCustomerName());
 				advanceEntity.setCustomerPhone(pacakgeDetailExcelDTO.getCustomerTelephone());
 				advanceEntity.setCustomerAddress(pacakgeDetailExcelDTO.getCustomerAddress());