Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java

@@ -7,7 +7,7 @@ package org.springblade.common.constant.loading;
  */
 public enum LoadScanSigningTypeStatusConstant {
 
-	sijiqianshou("司机签收",1),
+	sijiqianshou("司机扫描签收",1),
 	sijipiliangqianshou("司机批量签收",2),
 	wenyuanpiliangqianshou("文员批量签收",3);
 

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java

@@ -146,6 +146,10 @@ public class DistributionParcelListVO extends DistributionParcelListEntity {
 	@TableField(exist = false)
 	private String signingUser;
 
+	@ApiModelProperty(value = "签收人")
+	@TableField(exist = false)
+	private String signingType;
+
 	/**
 	 * 预约号
 	 */

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

@@ -131,7 +131,7 @@
     <select id="selectDistributionDeliverywrapInfoPage"
             resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
         SELECT
-          ldpl.*
+        DISTINCT ldpl.*
         FROM
         logpm_distribution_reservation_package ldrp
         join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id

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

@@ -37,6 +37,7 @@ import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.common.IsOrNoConstant;
+import org.springblade.common.constant.loading.LoadScanSigningTypeStatusConstant;
 import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageLoadingStatusConstant;
@@ -224,6 +225,22 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 		if (Func.isNotEmpty(loadscanEntity.getSigningUser())) {
 			parcel.setSigningUser(loadscanEntity.getSigningUser());
 		}
+		if (Func.isNotEmpty(loadscanEntity.getSignforType())) {
+			switch (loadscanEntity.getSignforType()) {
+				case 1:
+					parcel.setSigningType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
+					break;
+				case 2:
+					parcel.setSigningType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
+					break;
+				case 3:
+					parcel.setSigningType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
+					break;
+				default:
+					log.info("loadscanEntity.getSignforType() does not meet matching conditions: {}", loadscanEntity.getSignforType());
+					break;
+			}
+		}
 
 	}
 

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

@@ -4207,6 +4207,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										distributionParcelListVO.setScanStatus(LoadingStatusConstant.buluzhuangche.getName());
 										break;
 								}
+
+								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
+							}
+
+							if (Func.isNotEmpty(loadscanEntity.getSignforType())) {
+								switch (loadscanEntity.getSignforType()) {
+									case 1:
+										distributionParcelListVO.setSigningType(LoadScanSigningTypeStatusConstant.sijiqianshou.getName());
+										break;
+									case 2:
+										distributionParcelListVO.setSigningType(LoadScanSigningTypeStatusConstant.sijipiliangqianshou.getName());
+										break;
+									case 3:
+										distributionParcelListVO.setSigningType(LoadScanSigningTypeStatusConstant.wenyuanpiliangqianshou.getName());
+										break;
+									default:
+										log.info("loadscanEntity.getSignforType() does not meet matching conditions: {}", loadscanEntity.getSignforType());
+										break;
+								}
 								distributionParcelListVO.setLoadingNub(loadscanEntity.getLoadedNub());
 							}
 						}
@@ -6240,7 +6259,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 			//进行了一条包件任务的取消，此时就应该对预约、配送任务进行数量的维护
 			distributionAsyncService.checkRetentionReservationAndDeliveryInfo(reservationId, deliveryId);
-			return true;
 		} else {
 			//包件未预约   处于异常驳回状态
 			//查询异常信息，对异常信息进行清理

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java

@@ -252,7 +252,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 			.eq(WarehouseRetentionScanEntity::getDeliveryId, warehouseRetentionScanDTOS.getDeliveryId())
 		);
 		AtomicBoolean saveFlah = new AtomicBoolean(false);
-		if (Func.isNotEmpty(retentionScanEntityList)) {
+		if (Func.isNotEmpty(warehouseRetentionScanDTOList)) {
 			BladeUser user = AuthUtil.getUser();
 			Map<Long, WarehouseRetentionScanEntity> retentionPackageMap = retentionScanEntityList.stream().collect(Collectors.toMap(WarehouseRetentionScanEntity::getOrderPackageId, Function.identity(), (k1, k2) -> k2));
 			warehouseRetentionScanDTOList.forEach(rs -> {
@@ -291,15 +291,14 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl<Warehou
 							break;
 						default:
 							log.error(">>>>> rs.getConditions()={}", rs.getConditions());
-
 					}
 				}
 			});
 		}
 		//统计该滞留任务的包件数量
 		int retentionTotal = warehouseRetentionScanService.list(Wrappers.<WarehouseRetentionScanEntity>query().lambda()
-			.eq(WarehouseRetentionScanEntity::getDeliveryId, warehouseRetentionScanDTOS.getDeliveryId())
-			.eq(WarehouseRetentionScanEntity::getRefId, warehouseRetentionScanDTOS.getId())).stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity).sum();
+			.eq(WarehouseRetentionScanEntity::getDeliveryId, warehouseRetentionScanDTOS.getDeliveryId())).stream().mapToInt(WarehouseRetentionScanEntity::getRetentionQuantity)
+			.sum();
 		if (saveFlah.get()) {
 			return Resp.scanSuccess("操作成功", "共计滞留" + retentionTotal + "件");
 		} else {