Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml

@@ -93,7 +93,7 @@
                lbc.detailedly detailedly
         from logpm_basicdata_client lbc
         left join logpm_basicdata_store_contact lbsc on lbsc.shop_id = lbc.id
-        where id = #{clientId}
+        where lbc.id = #{clientId}
     </select>
 
 </mapper>

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

@@ -51,6 +51,7 @@ import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
 import org.springblade.common.constant.delivery.DeliveryStatusConstant;
+import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.reservation.*;
@@ -3762,6 +3763,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			return R.fail("请联系管理员....");
 		}
 		List<Long> list = Func.toLongList(distributionCancelReservationPackageDTO.getPackageIds());
+		log.info(method+"取消包件>>>>:{}",distributionCancelReservationPackageDTO.getPackageIds());
 		switch (distributionCancelReservationPackageDTO.getType()){
 			case 1:
 				//取消包件
@@ -3778,6 +3780,15 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								log.info(method+"检测当前取消包件存在装车或者签收操作:packageId{}",distributionCancelReservationPackageDTO.getPackageIds());
 								throw  new RuntimeException("包件存在装车、签收,无法进行取消");
 							}
+							//查询是否存在装车或者签收数据
+							List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.<DistributionLoadscanEntity>query().lambda()
+								.eq(DistributionLoadscanEntity::getPackageId, parcelListEntity.getId())
+								.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+							);
+							if (!loadscanEntityList.isEmpty()){
+								log.info(method+"检测当前取消包件存在装车或者签收操作:packageId{}",distributionCancelReservationPackageDTO.getPackageIds());
+								throw  new RuntimeException("包件存在装车、签收,无法进行取消");
+							}
 							//修改包件状态
 							parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
 							parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());