Merge branch 'fix_bug_2014-01-10' into dev

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

@@ -107,7 +107,7 @@
     </select>
 
     <select id="selectDistributionParcelListPage" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        SELECT
+        SELECT DISTINCT
         ldpl.warehouse_id warehouseId,
         ldpl.id id,
         lww.name warehouse,

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

@@ -5246,7 +5246,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		List<DistributionParcelListVO> allPackageList = new ArrayList<>();
 		List<DistributionParcelListEntity> reservationPackageList = baseMapper.getPackageListByDeliveryId(deliveryId, orderId);
 		DistributionReservationOrderPackageVO reservationOrderPackageVO = new DistributionReservationOrderPackageVO();
-		List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, orderId).eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue()).notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(), OrderPackageStatusConstant.yichuku.getValue()));
+
+		LambdaQueryWrapper<DistributionParcelListEntity> parcelListEntityLambdaQueryWrapper = Wrappers.<DistributionParcelListEntity>query().lambda()
+			.notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(),OrderPackageStatusConstant.yichuku.getValue())
+			.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
+			.eq(DistributionParcelListEntity::getStockArticleId, orderId);
+		if (Func.isNotEmpty(reservationPackageList)){
+			List<Long> packageIds = reservationPackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+			if (Func.isNotEmpty(packageIds)){
+				parcelListEntityLambdaQueryWrapper.notIn(DistributionParcelListEntity::getId,packageIds);
+			}
+		}
+		List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(parcelListEntityLambdaQueryWrapper);
 		if (Func.isNotEmpty(reservationPackageList)) {
 			List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(reservationPackageList);
 			allPackageList.addAll(DistributionParcelListWrapper.build().listVO(reservationPackageList));

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

@@ -3588,6 +3588,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 								log.info(method+"检测当前取消包件存在装车或者签收操作:packageId{}",distributionCancelReservationPackageDTO.getPackageIds());
 								throw  new RuntimeException("包件存在装车、签收,无法进行取消");
 							}
+							//修改包件状态
+							parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+							parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+							distributionParcelListMapper.updateById(parcelListEntity);
 							/**
 							 * 取消指定预约下包件
 							 */

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

@@ -1735,7 +1735,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					.eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId()));
 				BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 			}
-			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			//查询装车扫描表
 			DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 				.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
@@ -3576,6 +3576,19 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(reservationStockarticleEntity.getStockArticleId());
 						reservationEntity.setStockArticleId(reservationEntity.getStockArticleId() + stockArticleEntity.getOrderCode());
 					}
+					DistributionLoadscanEntity loadscanEntity = distributionLoadscanService.getOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
+						.eq(DistributionLoadscanEntity::getReservationId, a.getReservationId())
+						.eq(DistributionLoadscanEntity::getDeliveryId, a.getDeliveryListId())
+						.eq(DistributionLoadscanEntity::getPackageId, a.getPackageId())
+						.eq(DistributionLoadscanEntity::getOrderPackageCode, a.getPackageCode())
+						.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
+					);
+					loadscanEntity.setIsAbnormalLoading(1);
+					if (loadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())){
+						//已经进行签收了  这里就需要将异常签收的状态变更为正常
+						loadscanEntity.setIsAbnormalSigning(1);
+					}
+					distributionLoadscanService.updateById(loadscanEntity);
 					//构建新包件信息
 					DistributionReservationPackageEntity reservationPackageEntity = new DistributionReservationPackageEntity();
 					reservationPackageEntity.setReservationId(reservationEntity.getId());