装车判断包件是否存在

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>

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("操作失败", "包件已装车");

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)) {