From 16f27e863cd9cd5bdab64ae99dd7899d8a34ddac Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Apr 2024 09:36:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/service/IDistributionDeliveryListService.java | 2 +- .../service/impl/DistributionDeliveryListServiceImpl.java | 3 ++- .../service/impl/WarehouseRetentionRecordServiceImpl.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 6a7882935..91011f4c8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -337,7 +337,7 @@ public interface IDistributionDeliveryListService extends BaseService reservationEntities = reservationEntityList.stream().filter(r -> Func.isNotEmpty(r.getConsignee()) && r.getConsignee().equals(stockArticleEntity.getCustomerName()) && r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) && r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) && r.getMallName().equals(stockArticleEntity.getMallName())).collect(Collectors.toList()); //查看是否存在满足条件的预约单 - if (reservationEntities.size() == 1) { + //存在多个，操作人指定具体客户即可 + if (!reservationEntities.isEmpty()) { if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) { log.info("异常装车未指定客户"); return Resp.scanFail("请指定客户进行异常装车", "请指定客户进行异常装车"); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java index c57ca06c7..b436d4386 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseRetentionRecordServiceImpl.java @@ -261,6 +261,7 @@ public class WarehouseRetentionRecordServiceImpl extends BaseServiceImpl Date: Sun, 28 Apr 2024 10:09:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionParcelListServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 76bce1852..7501fa694 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -501,6 +501,11 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl list1 = baseMapper.selectList(queryWrapper); + boolean flag = list1.stream().anyMatch(p -> OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(p.getOrderPackageReservationStatus())); + if (flag){ + String collect = list1.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(",")); + throw new ServiceException(collect+"包件已预约,无法转为库存品"); + } boolean b = list1.stream().anyMatch(i -> ObjectUtils.isNull(i.getMaterialId())); if (b) { throw new ServiceException("有包件未维护物料信息，请维护后在进行操作！！"); From a0674ee4872b480314be57a49696065e0fb53e26 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 28 Apr 2024 10:22:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/distribution/excel/DistributionStockArticleExcel.java | 2 +- .../service/impl/DistributionStockArticleServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java index a2cd0faed..3ecb37f03 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java @@ -78,7 +78,7 @@ public class DistributionStockArticleExcel implements Serializable { * 仓库 */ @ColumnWidth(20) - @ExcelProperty("仓库") + @ExcelProperty("所在仓库") private String warehouse; /** * 仓库 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 7de83320a..02c38752e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -191,8 +191,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl