From aa97b39e2a4653ea7287c6ae8daebe2ba616a9de Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 11 Nov 2023 16:07:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionParcelListServiceImpl.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 4f55f9944..283113dd5 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
@@ -629,6 +629,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		// 品牌
 		distributionStockListEntity.setBrandId(Optional.ofNullable(distributionParcelList.getBrandId()).orElse(null));
 		distributionStockListEntity.setUnpackingQuantity(0);
+		distributionStockListEntity.setSourceType("1"); //类型
 
 		BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(distributionParcelList.getMaterialId());
 		distributionStockListEntity.setSku(materialOwnId.getSku());
@@ -636,7 +637,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		distributionStockListEntity.setParcelListId(distributionParcelList.getId());//包件id
 		distributionStockListEntity.setQuantityOccupied(0);//冻结数量
 		distributionStockListEntity.setServiceType(distributionStockArticleEntity.getTypeService());//冻结数量
-		DistributionStockListEntity stockListEntity = distributionStockListService.getStockListEntity(distributionStockArticleEntity.getMallId(), distributionParcelList.getMaterialId(), distributionStockArticleEntity.getWaybillNumber(),distributionStockArticleEntity.getStoreId(),distributionStockArticleEntity.getWarehouseId());
+		DistributionStockListEntity stockListEntity = distributionStockListService.getStockListEntity(distributionStockArticleEntity.getMallId(), distributionParcelList.getMaterialId(), distributionStockArticleEntity.getOrderCode(),distributionStockArticleEntity.getStoreId(),distributionStockArticleEntity.getWarehouseId());
 		if(ObjectUtils.isNotNull(stockListEntity)){
 			//有记录
 			DistributionStockListEntity listEntity = new DistributionStockListEntity();
@@ -654,7 +655,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		distributionStockListEntity.setDespatch(Optional.ofNullable(distributionStockArticleEntity.getTrainNumber()).orElse(null));//车次号
 		distributionStockListEntity.setStockArticleId(Optional.ofNullable(distributionParcelList.getStockArticleId()).orElse(null)); //订单ID
 		distributionStockListEntity.setOrderCode(Optional.ofNullable(distributionStockArticleEntity.getOrderCode()).orElse(null)); //订单自编号
-		distributionStockListEntity.setSourceType("1"); //订单自编号
+
 		//添加库存品记录
 		DistributionStockListInfoEntity distributionStockListInfo = new DistributionStockListInfoEntity();
 		BeanUtil.copyProperties(distributionStockListEntity,distributionStockListInfo);

From e27be4fab253dd38158bd345735bfc05d4a8b6fe Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Sat, 11 Nov 2023 16:30:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 71ac1382b..3bcb8765d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -348,7 +348,7 @@
 	) ordNub,
 	COALESCE ( lds.received_quantity + lds.receivedin_quantity, 0 ) signNub,
 	ldsk.stockup_area stockupArea,
-	COALESCE ( ldrs.reservation_num, 0 ) inventoryNub
+	(SELECT SUM(reservation_num) FROM logpm_distribution_reservation_stocklist  WHERE reservation_id = ldr.id ) inventoryNub
 -- 	COUNT(DISTINCT lwtg.tray_id) AS trayNum
 FROM
 	logpm_distribution_signfor lds