From 53d2b8e7769931414dd090a23c6a398cba8a93b9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 14 Dec 2023 10:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=B8=BB=E5=89=AF=E5=8F=B8?=
 =?UTF-8?q?=E6=9C=BA=E3=80=81=E5=A2=9E=E5=8A=A0=E9=85=8D=E9=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=A3=85=E8=BD=A6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/vo/DistributionParcelListVO.java |  4 ++++
 .../mapper/DistributionDeliveryListMapper.xml     |  2 +-
 .../impl/DistributionDeliveryListServiceImpl.java | 15 +++++++++++++--
 .../impl/DistributionReservationServiceImpl.java  | 11 +++++++++--
 .../wrapper/DistributionDeliveryListWrapper.java  |  1 +
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
index 961be6fd0..048a87e6a 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java
@@ -122,6 +122,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	 * 签收数量
 	 */
 	private Integer  signingNub;
+	/**
+	 * 签收数量
+	 */
+	private Date  loadingTime;
 
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index d2a036d88..9fc377110 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -1598,7 +1598,7 @@
             INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
             INNER JOIN logpm_distribution_reservation AS ldr ON lds.reservation_id = ldr.id
             INNER JOIN logpm_distribution_reservation_stockarticle As ldrs ON ldrs.reservation_id = ldr.id
-            INNER JOIN logpm_distribution_stock_article As ldsa ON ldsa.id = ldrs.stockarticle_id
+            INNER JOIN logpm_distribution_stock_article As ldsa ON ldsa.id = ldrs.stock_article_id
             WHERE lddl.id = #{delivaryListId} and ldrs.stock_article_status != 2
     </select>
     <select id="getReservationStockArticleByDeliveryId"
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 78e6a9e62..4f573ed02 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -3461,11 +3461,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
 				if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) {
 					deliverySelfEntity.setIsMaster(ServiceConstant.IS_MASTER_YES);
+					driverNames.append(deliverySelfEntity.getDriverName()).append("(主),");
+
+				}else {
+					driverNames.append(deliverySelfEntity.getDriverName()).append(",");
 				}
 				deliverySelfEntity.setDeliveryId(deliveryListEntity.getId());
 				//自主配送需要对司机名称进行重新拼接
 				distributionDeliverySelfService.save(deliverySelfEntity);
-				driverNames.append(deliverySelfEntity.getDriverName()).append(",");
 				vehicleNubs.append(deliverySelfEntity.getVehicleNub()).append(",");
 			});
 			deliveryListEntity.setDistributionCompany("汇通");
@@ -4047,11 +4050,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				DistributionDeliverySelfEntity deliverySelfEntity = Func.copy(a, DistributionDeliverySelfEntity.class);
 				if (a.getDriverName().equals(deliveryListDTO.getMasterDriverName()) && a.getVehicleNub().equals(deliveryListDTO.getMasterVehicleNub())) {
 					deliverySelfEntity.setIsMaster(ServiceConstant.IS_MASTER_YES);
+					driverNames.append(deliverySelfEntity.getDriverName()).append("(主),");
+
+				}else {
+					driverNames.append(deliverySelfEntity.getDriverName()).append(",");
+
 				}
 				deliverySelfEntity.setDeliveryId(deliveryListEntity.getId());
 				//自主配送需要对司机名称进行重新拼接
 				distributionDeliverySelfService.save(deliverySelfEntity);
-				driverNames.append(deliverySelfEntity.getDriverName()).append(",");
+//				driverNames.append(deliverySelfEntity.getDriverName()).append(",");
 				vehicleNubs.append(deliverySelfEntity.getVehicleNub()).append(",");
 			});
 			deliveryListEntity.setDistributionCompany("汇通");
@@ -4181,6 +4189,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							if (Func.isNotEmpty(loadscanEntity.getLoadedNub())) {
 								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
+							if (Func.isNotEmpty(loadscanEntity.getScanTime())) {
+								distributionParcelListVO.setLoadingTime(loadscanEntity.getScanTime());
+							}
 							if (Func.isNotEmpty(loadscanEntity.getScanStatus())) {
 								switch (loadscanEntity.getScanStatus()) {
 									case "1":
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 9703ac2bb..f2bf727fd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -1309,13 +1309,16 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				if (Func.equals(allocationDTO.getMasterDriverName(), a.getDriver())) {
 					//设置主司机
 					distributionDeliverySelfEntity.setIsMaster(ServiceConstant.IS_MASTER_YES);
+					driverNames.append(a.getDriver()).append("(主),");
+
+				}else {
+					driverNames.append(a.getDriver()).append(",");
 				}
 				//完成对自主配送司机信息保存
 				distributionDeliverySelfEntity.setDeliveryId(deliveryListId);
 				distributionDeliverySelfService.save(distributionDeliverySelfEntity);
 				//司机车辆名称拼接
 				vehicleNubs.append(a.getVehicleNub()).append(",");
-				driverNames.append(a.getDriver()).append(",");
 			});
 			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
 			distributionDeliveryListEntity.setDistributionCompany("汇通");
@@ -2292,13 +2295,17 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				if (allocationDTO.getMasterDriverName().equals(a.getDriverName())) {
 					//设置主司机
 					distributionDeliverySelfEntity.setIsMaster(ServiceConstant.IS_MASTER_YES);
+					driverNames.append(a.getDriverName()).append("(主),");
+				}else {
+					driverNames.append(a.getDriverName()).append(",");
+
 				}
 				//完成对自主配送司机信息保存
 				distributionDeliverySelfEntity.setDeliveryId(distributionDeliveryListEntity.getId());
 				distributionDeliverySelfService.save(distributionDeliverySelfEntity);
 				//司机车辆名称拼接
 				vehicleNubs.append(a.getVehicleNub()).append(",");
-				driverNames.append(a.getDriverName()).append(",");
+//				driverNames.append(a.getDriverName()).append(",");
 			});
 			distributionDeliveryListEntity.setDistributionCompany("汇通");
 			distributionDeliveryListEntity.setKind(ServiceConstant.DELIVERLIST_KIND_SELF);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java
index 8c26f7f4c..798fc8904 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionDeliveryListWrapper.java
@@ -29,6 +29,7 @@ public class DistributionDeliveryListWrapper extends BaseEntityWrapper<Distribut
 		deliveryListVO.setKindName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_DELIVERY_KiIND,entity.getKind()));
 		deliveryListVO.setTypeName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE,entity.getType()));
 		deliveryListVO.setDeliveryListLoadingStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_LIST_LOADING_STATUS,entity.getDeliveryListLoadingStatus()));
+
 		return deliveryListVO;
 	}
 }