diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java new file mode 100644 index 000000000..0922121a2 --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/loading/LoadScanSigningTypeStatusConstant.java @@ -0,0 +1,46 @@ +package org.springblade.common.constant.loading; + +/** + * 订单冻结状态枚举 + * 对应码表 freeze_status + * @author pref + */ +public enum LoadScanSigningTypeStatusConstant { + + sijiqianshou("司机签收",1), + sijipiliangqianshou("司机批量签收",2), + wenyuanpiliangqianshou("文员批量签收",3); + + + /** + * 状态 + */ + private String name; + + /** + * 值 + */ + private Integer value; + + + private LoadScanSigningTypeStatusConstant(String name, Integer value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java index 0229a357e..e3615b542 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java @@ -354,4 +354,10 @@ public class DistributionLoadscanEntity extends TenantEntity { */ @ApiModelProperty(value = "是否异常装车 1-否 2-是") private Integer isZero; + + /** + * 签收方式 + */ + @ApiModelProperty(value = "签收方式") + private Integer signforType; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java index ad98ee83f..0fb8d3aea 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscaninvnEntity.java @@ -335,4 +335,10 @@ public class DistributionLoadscaninvnEntity extends TenantEntity { @ApiModelProperty(value = "是否一键签收（1-不是,2-是）") private Long signingUserId; + /** + * 签收方式 + */ + @ApiModelProperty(value = "签收方式") + private Integer signforType; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionLoadscanAbnormalVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionLoadscanAbnormalVO.java index 95fb6c0e1..d83a09e72 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionLoadscanAbnormalVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionLoadscanAbnormalVO.java @@ -67,11 +67,17 @@ public class DistributionLoadscanAbnormalVO extends DistributionLoadscanAbnormal private String signingUser; /** - * 是否异常签收 + * 异常签收 */ - @ApiModelProperty(value = "签收人") + @ApiModelProperty(value = "异常签收") private Integer isAbnormalSigning; + /** + * 异常装车 + */ + @ApiModelProperty(value = "异常装车") + private Integer isAbnormalLoading; + /** * 一级品 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 9a9798e1e..afc7f9ece 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -1106,6 +1106,7 @@ ldl.signing_time AS signingTime, ldl.signing_user AS signingUser, ldl.is_abnormal_signing AS isAbnormalSigning, + ldl.is_abnormal_loading AS isAbnormalLoading, ldpl.firsts AS firsts, ldpl.second AS `second`, ldpl.third_product AS thirdProduct, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java index 45f318ff3..bf501967f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java @@ -195,6 +195,23 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()).eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())); + + List isMayList = distributionLoadscanAbnormalService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanAbnormalEntity::getPackageCode, distrilbutionloadingscanDTO.getBarcode()) + .eq(DistributionLoadscanAbnormalEntity::getPackageId, parcelListEntity.getId()) + //修改 状态 + ); + if (!isMayList.isEmpty()) { + //这里需要判定文员是否对该异常进行驳回操作 + List LoadscanAbnormalEntityList = isMayList.stream().filter(f -> distributionDeliveryListEntity.getId().equals(f.getDeliveryListId()) && distrilbutionloadingscanDTO.getReservationId().equals(f.getReservationId())).collect(Collectors.toList()); + if (!LoadscanAbnormalEntityList.isEmpty()) { + //存在异常操作 + if (LoadscanAbnormalEntityList.size() == 1) { + //判断是否进行审核以及驳货操作 + DistributionLoadscanAbnormalEntity distributionLoadscanAbnormalEntity = LoadscanAbnormalEntityList.get(0); + if (distributionLoadscanAbnormalEntity.getAuditingStatus().equals(3)) { + return Resp.scanFail("包件异常已驳回,请滞留回库", "包件异常已驳回,请滞留回库"); + } + } + } + + } List reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId()); if (!reservationEntityList.isEmpty()) { boolean shangpeiFlag = reservationEntityList.stream().allMatch(r -> r.getDeliveryType().equals(DistributionTypeConstant.shipie.getValue())); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 3baf49e8d..2e0f95b39 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -70,10 +70,7 @@ import org.springblade.common.constant.billLading.BillLadingStatusConstant; 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.LoadScanSigningStatusConstant; -import org.springblade.common.constant.loading.LoadingAbnormalAuditingStatusConstant; -import org.springblade.common.constant.loading.LoadingIsInsertConstant; -import org.springblade.common.constant.loading.LoadingStatusConstant; +import org.springblade.common.constant.loading.*; import org.springblade.common.constant.orderpackage.*; import org.springblade.common.constant.reservation.*; import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant; @@ -1710,6 +1707,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl handleStockUp(DistributionStockupEntity distributionStockupEntity) { List nodeVos = new ArrayList<>(); try { @@ -2498,6 +2497,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl packageLockIds = new ArrayList<>(); try { @@ -3335,6 +3335,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl distributionStockArticleEntities = distributionStockArticleService.listByIds(orderIds); + List reservationOrders = distributionReservationStockarticleService.list(Wrappers.query().lambda() .eq(DistributionReservationStockarticleEntity::getReservationId, distributionDeliveryList.getReservationId()) .in(DistributionReservationStockarticleEntity::getStockArticleId, orderIds) @@ -4059,7 +4061,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl pushOldPackageSigning) { for (SignPushDataUnitDTO signPushDataUnitDTO : pushOldPackageSigning) { User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getAdministratorsId()); @@ -6662,10 +6666,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl customers) { for (SignPushDataContactDTO signPushDataUnitDTO : customers) { User user = bladeRedis.get(RedisKeyConstant.USER_NAME_PHONE_KEY + signPushDataUnitDTO.getSignUserId()); - log.info("buildNameAndPhone >>> 获取缓存的中的用户信息{}", user); + log.info("buildNameAndPhone >>> 获取缓存的中的用户信息{}",user); if (user == null) { R userT = userClient.userInfoById(signPushDataUnitDTO.getSignUserId()); if (userT.isSuccess()) { @@ -6676,13 +6681,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>用户名称:{}", user.getName()); + }else { + log.info("用户无电话号码且账号信息为空>>用户名称:{}",user.getName()); } } }