From 1a32f89acc7e11aefaf9e54a2fb0c1459e0097cb Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 10 Nov 2023 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B8=82=E9=85=8D=E9=85=8D=E9=80=81=E5=8D=95?=
=?UTF-8?q?=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<Distrib
List<Map<String, Object>> spaclOrderList = buildSpaclOrders(distributionReservationEntity, 1);
map.put("定制品集合", spaclOrderList);
- map.put("定制品合计", spaclOrderList.stream().mapToInt(map1 -> Integer.parseInt(map1.get("数量").toString())).sum());
+ Integer spaclNum = 0;
+ for (Map<String, Object> m:spaclOrderList){
+ Integer num = (Integer) m.get("数量");
+ spaclNum = spaclNum + num;
+ }
+ map.put("定制品合计", spaclNum);
// 通过预约单查询预约下面的订单 --1 或者 库存品 --2
List<Map<String, Object>> 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<String, Object> m:spaclStockList){
+ Integer num = (Integer) m.get("数量");
+ spaclStockNum = spaclStockNum + num;
+ }
+ map.put("库存品合计", spaclStockNum);
}
@@ -5789,11 +5798,12 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (ObjectUtils.isNull(distributionStockListEntity)) {
continue;
}
+ Integer reservationNum = reservationStocklistEntity.getReservationNum();
temp.put("合同号", distributionStockListEntity.getOrderCode());
- temp.put("产品名称", distributionStockListEntity.getDescriptionGoods());
+ temp.put("产品名称", distributionStockListEntity.getDescriptionGoods()+"("+reservationNum+")");
//todo 单位是否需要查询物料表
temp.put("单位", Optional.ofNullable(distributionStockListEntity.getCargoUnit()).orElse(null));
- temp.put("数量", reservationStocklistEntity.getReservationNum());
+ temp.put("数量", reservationNum);
temp.put("备货区", getStockupArea(distributionReservationEntity.getId()));
//todo 这里还没完成
List<String> allocationList = distributionReservationMapper.getStockListAllocation(distributionStockListEntity.getId(), distributionReservationEntity.getId());