From 02d75eeb09497a8339f41d9b6247a031cc3414c9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 13 Mar 2024 17:03:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E5=88=A4=E6=96=AD=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java      | 3 +++
 .../service/impl/DistributionSignforServiceImpl.java           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml
index a955116e6..eee4a32fa 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml
@@ -88,7 +88,7 @@
         lbda.carrier_id carrierId,
         lbda.transportation_agreement transportationAgreement,
         lbda.user_id userId,
-        (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles
+        (SELECT GROUP_CONCAT(lbv.vehicle_nub SEPARATOR ',') from logpm_basicdata_drivermiddle lbd LEFT JOIN logpm_basicdata_vehicle AS lbv ON lbd.brand_id = lbv.id WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles
         FROM
         logpm_basicdata_driver_artery lbda
         <where>
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 0beb50a86..6d16659fe 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
@@ -559,6 +559,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//查询当前扫描的包件是否进行了装车
 		DistributionParcelListEntity parcelList = distributionParcelListService.selectByOrderPackageCode(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
+		if (Func.isEmpty(parcelList)){
+			return Resp.scanFail("操作失败", "系统无编码");
+		}
 		if (!Objects.isNull(parcelList)) {
 			if (OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(parcelList.getOrderPackageLoadingStatus())) {
 				return Resp.scanFail("操作失败", "包件已装车");
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 f9c8cd9f0..23fb93b85 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
@@ -1853,7 +1853,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 			DistributionParcelListEntity parcelListEntity = distributionParcelListService.selectByOrderPackageCode(distrilbutionloadingscanDTO.getBarcode(), myCurrentWarehouse.getId());
 			if (Func.isEmpty(parcelListEntity)) {
-				return Resp.scanFail("包件信息不存在", "包件信息不存在");
+				return Resp.scanFail("操作失败", "系统无编码");
 			}
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
 			if (Func.isEmpty(distributionReservationEntity)) {