装车包件状态判断、配送详情增加是否异常签收查询

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml

@@ -91,6 +91,7 @@
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
+        lds.is_have_abnormal_package isHaveAbnormalPackage,
         (SELECT
        ldss.forklift_name
         FROM

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -599,6 +599,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
 		if (distrilbutionloadingscanDTO.getType() == 1) {
+			if (!Objects.isNull(parcelList)){
+				if (OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(parcelList.getOrderPackageLoadingStatus())){
+					return Resp.scanFail("操作失败", "包件已装车");
+				}
+			}
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
 			if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 				//在客户列表进行装车

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -3538,7 +3538,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (signStatus){
 			reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
 		}else {
-			//判断是否都为完成装车
+			//判断是否都为完成签收
 			Integer signingNum =  distributionLoadscanMapper.selectSigningNumByReservationId(reservationId);
 			//判断当前客户是否签收完成了
 			if (signingNum > 0){