From 0415029b6e3543a02f1bcc39e969075f88ae2efb Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 19 Nov 2024 16:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E5=A4=96=E5=8D=8FPC=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E3=80=81=E5=9C=A8=E6=89=98=E8=AF=A6=E6=83=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8C=85=E4=BB=B6=E5=95=86=E5=9C=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/basicdata/vo/WarehouseParcelListVO.java  | 5 +++++
 .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 4 +++-
 .../service/impl/DistributionSignforServiceImpl.java        | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java
index 9e25450bf..46391d5f7 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/WarehouseParcelListVO.java
@@ -104,6 +104,11 @@ public class WarehouseParcelListVO extends WarehouseParcelListEntity {
 	 */
 	private String positionCode;
 
+	/**
+	 * 所在库位
+	 */
+	private String mallName;
+
 
 	/**
 	 * 是否窜货 0否 1是
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
index 5a262afae..ab5139983 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml
@@ -117,10 +117,12 @@
         lwga.layer_num layerNum,
         lwtg.create_time operateTime,
         lwtg.create_user operateUser,
-        lwtg.is_fleeing isFleeing
+        lwtg.is_fleeing isFleeing,
+        ldsa.mall_name
         FROM
         logpm_warehouse_tray_goods lwtg
         JOIN logpm_distribution_parcel_list ldpl ON lwtg.association_id = ldpl.id
+        JOIN logpm_distribution_stock_article ldsa ON ldpl.stock_article_id  = ldsa.id
         left join ( logpm_warehouse_updown_goods lwug join logpm_warehouse_goods_allocation lwga on lwug.allocation_id = lwga.id ) on lwug.association_id = ldpl.id
         <where>
             ldpl.is_deleted = 0  and lwtg.is_deleted = 0 and  lwtg.association_type = 3 and  lwtg.tray_id = #{param.id}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 486601212..9c4fe7ed9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1320,6 +1320,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					loadingId = collect.get(0);
 				} else if ("2".equals(deliveryListEntity.getKind())) {
 					//外协
+					DistributionDeliverySelfEntity deliverySelfEntity = this.getDriver(deliveryListEntity, user, false);
+					if (!Objects.isNull(deliverySelfEntity)){
+						driverPhone = deliverySelfEntity.getDriverPhone();
+						driverName = deliverySelfEntity.getDriverName();
+						vehicleNub = deliverySelfEntity.getVehicleNub();
+					}
 				} else {
 					log.error(method + "配送司机异常:{}", distrilbutionloadingscanDTO.getDeliveryId());
 					return R.fail("请联系管理员");