From 740df3dc1cce27f4c26048759107a3af3a65442a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 11 Dec 2023 19:04:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=98=E7=9B=98=E8=A3=85=E8=BD=A6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/vo/app/DistributionAppReservationVO.java  | 5 +++++
 .../distribution/mapper/DistributionReservationMapper.xml  | 2 +-
 .../service/impl/DistributionDeliveryListServiceImpl.java  | 2 ++
 .../service/impl/DistributionParcelListServiceImpl.java    | 7 ++++---
 .../service/impl/DistributionStockupServiceImpl.java       | 1 -
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
index c7bee8cdf..0b888375e 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppReservationVO.java
@@ -100,6 +100,11 @@ public class DistributionAppReservationVO extends DistributionReservationEntity
 	 */
 	@ApiModelProperty(value = "托盘码")
 	private String trayCode;
+	/**
+	 * 托盘名称
+	 */
+	@ApiModelProperty(value = "托盘码")
+	private String trayName;
 
 	/**
 	 * 货物名称
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 4334a3a0c..67e04b3a4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -320,7 +320,7 @@
         ldsl.id,
         ldrs.id as deliveryDetailsId,
         ldsl.cargo_unit as cargoUnit,
-        SUM(ldrs.reservation_num) AS reservationNum
+        ldrs.reservation_num AS reservationNum
         FROM
         logpm_distribution_reservation_stocklist ldrs
         LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
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 6f6e8d857..900c4f0cf 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
@@ -5004,6 +5004,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			TrayTypeDataVO trayTypeDataVO = warehouseTrayTypeClient.selectListByTrayCode(c.getTrayCode());
 			if (Func.isNotEmpty(trayTypeDataVO)) {
+				String trayName = trayTypeDataVO.getTrayName();
+				c.setTrayname(trayName);
 				List<WarehouseTrayGoodsEntity> goodsLsit = trayTypeDataVO.getGoodsLsit();
 				if (Func.isNotEmpty(goodsLsit)) {
 					List<Long> longs = goodsLsit.stream().map(WarehouseTrayGoodsEntity::getAssociationId).collect(Collectors.toList());
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 8224a9141..056b1a5c8 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
@@ -486,7 +486,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				}
 				if(stockArticleEntity1.getTotalNumber().equals(list1.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);
+
 					//修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
@@ -500,8 +501,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 				);
 				if(!distributionParcelListEntities.isEmpty() && stockArticleEntity1.getTotalNumber().equals(distributionParcelListEntities.size())){
 					//修改订单状态
-					DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
-						//修改
+					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);
+					//修改
 						stockArticleEntity.setId(oo);
 						stockArticleEntity.setGenre(2);
 					distributionStockArticleMapper.updateById(stockArticleEntity);
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 ed1ec88e0..51cca61bc 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
@@ -1179,7 +1179,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 			//商，市
 			List<DistributionStockupStockListVO> list = distributionReservationService.selectStockupStockList(reservationId);
-
 			for (int i = 0; i < list.size(); i++) {
 				DistributionStockupStockListVO distributionStockupStockListVO = list.get(i);
 				if (distributionStockupStockListVO.getPlanNum().equals(distributionStockupStockListVO.getRealNum())) {