Browse Source

fix:修改判断条件

dist.1.3.0
pref_mail@163.com 5 months ago
parent
commit
3fdaa632a5
  1. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

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

@ -8345,7 +8345,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (isSatisfy) {
//本车次的异常装车
DistributionLoadscanEntity distributionLoadscanEntity = loadscanEntityList.get(0);
if (distributionLoadscanEntity.getIsAbnormalSigning().equals("2")) {
if (distributionLoadscanEntity.getIsAbnormalSigning().equals(2)) {
//进行异常签收的标识
//存在装车数据
distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
@ -9256,9 +9256,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
//查询当前异常包件锁关联的订单信息
DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
if (Objects.isNull(parcelListEntity)) {
return Resp.scanFail("订单信息错误", "订单信息错误");
}
//查询是否在本车次进行异常装车
List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
.eq(DistributionLoadscanEntity::getOrderPackageCode, barcode)
@ -9395,7 +9392,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (!packageLockIds.isEmpty()) {
List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryList.getTrainNumber() + ":orderPackageIds:");
if (!Objects.isNull(a)) {
boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
boolean flag = a.stream().anyMatch(packageLockIds::contains);
if (flag) {
//正在操作,请稍后重试
throw new CustomerException("该包件正在被操作,请稍后再试!!!");

Loading…
Cancel
Save