From 7ca2c3c2ec900ef3eafd40a504abb6b625e2712e Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 10 Nov 2023 11:23:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=98=E7=9B=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml | 3 +++ .../service/impl/DistributionStockupServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) 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 17a4eba76..c69ebd65d 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 @@ -84,6 +84,9 @@ and tray.pallet_code like concat('%',#{po.palletCode},'%') + + and tray.pallet_name like concat('%',#{po.palletName},'%') + order by tray.create_time desc 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 c9fee32af..8c3e0d416 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 @@ -1808,7 +1808,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl Date: Fri, 10 Nov 2023 11:25:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionDeliveryListServiceImpl.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 3ed9fac91..4542ad4e1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.gson.JsonObject; import com.logpm.basic.entity.BasicPrintTemplateEntity; import com.logpm.basic.feign.IBasicPrintTemplateClient; import com.logpm.basicdata.entity.BasicdataDriverArteryEntity; @@ -5626,13 +5625,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl> spaclOrderList = buildSpaclOrders(distributionReservationEntity, 1); map.put("定制品集合", spaclOrderList); - map.put("定制品合计", spaclOrderList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum()); + Integer spaclNum = 0; + for (Map m:spaclOrderList){ + Integer num = (Integer) m.get("数量"); + spaclNum = spaclNum + num; + } + map.put("定制品合计", spaclNum); // 通过预约单查询预约下面的订单 --1 或者 库存品 --2 List> spaclStockList = buildSpaclOrders(distributionReservationEntity, 2); if (spaclStockList.size() > 0 && !spaclStockList.isEmpty()) { map.put("库存品集合", spaclStockList); - map.put("库存品合计", spaclStockList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum()); + Integer spaclStockNum = 0; + for (Map m:spaclStockList){ + Integer num = (Integer) m.get("数量"); + spaclStockNum = spaclStockNum + num; + } + map.put("库存品合计", spaclStockNum); } @@ -5789,11 +5798,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl allocationList = distributionReservationMapper.getStockListAllocation(distributionStockListEntity.getId(), distributionReservationEntity.getId());