From f038479e5dfbbad04af608a8f090a96f81b8b066 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 22 Apr 2024 19:30:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E6=89=93=E6=89=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=9A=84?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java | 3 +++ .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 3 ++- .../service/impl/DistributionStockupServiceImpl.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java index b19577a77..b9f3e2261 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTrayVO.java @@ -49,4 +49,7 @@ public class BasicdataTrayVO extends BasicdataTrayEntity { @ApiModelProperty(value = "打托方式显示") private String trayTypeString; + @ApiModelProperty(value = "串货条件") + private String filterValue; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml index 8c43cef07..a1eedfaeb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml @@ -61,7 +61,8 @@ tray.tray_status, warehouse.name AS warehouseName, tray.`type`, - lwtt.tray_type + lwtt.tray_type, + lwtt.filter_value FROM logpm_warehouse_tray AS tray left join logpm_warehouse_tray_type lwtt on tray.id = lwtt.tray_id and lwtt.is_deleted=0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 3bf4d031c..121b2b3a7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -2931,7 +2931,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl { // List di = new ArrayList<>(); // AtomicReference s = new AtomicReference<>(0); //已扫数量 - v.stream().forEach(i -> { + v.forEach(i -> { DistributionParcelListEntity byId = distributionParcelListService.getById(i.getAssociationId()); if (ObjectUtils.isNotNull(byId)) { if (!vo.getStockArticleId().contains(byId.getStockArticleId().toString())) {