From 26bc5d609f4e2bec13c09ad893e7a10e9acc5b62 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 22 Nov 2023 18:35:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=98=8E=E7=BB=86?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=B8=E6=9C=BA=E7=94=B5=E8=AF=9D=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/logpm/distribution/vo/DistributionSigndetailVO.java | 6 ++++++
.../distribution/mapper/DistributionSigndetailMapper.xml | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
index 9de6459dd..86849b643 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
@@ -85,6 +85,12 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
@ApiModelProperty(value = "司机名称")
private String driverName;
+ /**
+ * 司机电话
+ */
+ @ApiModelProperty(value = "司机电话")
+ private String driverPhone;
+
/**
* 车牌号
*/
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
index 1840ef057..3fb82cf7e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml
@@ -139,6 +139,11 @@
lddl.driver_name driverName,
lddl.vehicle_name vehicleName,
lddl.kind,
+ CASE lddl.kind
+ WHEN '1' THEN (SELECT ldds.driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id = lddl.id AND ldds.is_master = 2)
+ WHEN '2' THEN (SELECT lddt.driver_phone FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id = lddl.id )
+ ELSE ''
+ END driverPhone,
(SELECT GROUP_CONCAT(ldpl.material_name SEPARATOR ',') FROM logpm_distribution_parcel_list ldpl WHERE ldpl.stock_article_id = ldsa.id) materialName,
(SELECT COALESCE (count(*) ,0) FROM logpm_distribution_reservation_package ldrpp WHERE ldsa.id = ldrpp.stock_article_id and ldrpp.reservation_id =ldrs.reservation_id) totalNumber,
(select COALESCE (count(*) ,0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.signfor_state =2) signfornum
From b5859ab02d99dcf54aae3a729446d1c307f727ea Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 22 Nov 2023 18:58:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml | 2 +-
.../main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml
index 49409c8e6..c722dde58 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/QuestDetailMapper.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
index cea96b9fe..b43d22b52 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml
@@ -440,7 +440,7 @@
lqd.stock_num stockNum,
lqd.position_code positionCode,
lqd.grounding_position_code groundingPositionCode,
- lqd.orde_package_code ordePackageCode,
+ lqd.order_package_code ordePackageCode,
lqd.order_package_id orderPackageId,
lqd.update_time updateTime,
ldpl.service_number serviceNumber,