From 26e705d70a6231e6db4889b0b014a68c7addbb53 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 6 Mar 2024 20:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81=E6=8B=86=E5=8C=85BU?=
 =?UTF-8?q?G=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockListInfoEntity.java      |  7 +++++++
 .../DistributionStockListServiceImpl.java     | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java
index 234e0fd4f..7619466ee 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java
@@ -107,6 +107,13 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库ID")
 	private Long warehouseId;
+
+
+	/**
+	 * 仓库ID
+	 */
+	@ApiModelProperty(value = "仓库ID")
+	private Long stockListId;
 	/**
 	 * 仓库名称
 	 */
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index eb8efd3e1..e83bccd7e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -263,7 +263,12 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			this.updateById(d);
 			//新增入库记录
 			BeanUtil.copyProperties(d, distributionStockListInfo);
-
+			distributionStockListInfo.setId(null);
+			distributionStockListInfo.setStockListId(d.getId());
+			distributionStockListInfo.setOutboundQuantity(0);
+			distributionStockListInfo.setGroundingTime(new Date());
+			distributionStockListInfo.setQuantityStock(i);
+			distributionStockListInfoService.save(distributionStockListInfo);
 			//添加拆包记录
 			distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one2.getStockArticleId()).orElse(null));
 			distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one2.getOrderCode()).orElse(null));
@@ -288,7 +293,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				basicMaterialEntity.setPid(distributionStockListDTO.getMaterialId());
 				aLong = basicMaterialClient.addMaterial(basicMaterialEntity);
 			}else {
-				aLong = one.getMarketId();
+				aLong = one.getMaterialId();
 			}
 			if (Func.isNotEmpty(one)) {
 				//生成新的库存品信息
@@ -310,7 +315,12 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				this.save(distributionStockListEntity);
 				//新增入库记录
 				BeanUtil.copyProperties(distributionStockListEntity, distributionStockListInfo);
-
+				distributionStockListInfo.setId(null);
+				distributionStockListInfo.setStockListId(distributionStockListEntity.getId());
+				distributionStockListInfo.setOutboundQuantity(0);
+				distributionStockListInfo.setGroundingTime(new Date());
+				distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
+				distributionStockListInfoService.save(distributionStockListInfo);
 				//添加拆包记录
 				distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one.getStockArticleId()).orElse(null));
 				distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one.getOrderCode()).orElse(null));
@@ -323,8 +333,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			}
 
 		}
-		distributionStockListInfo.setGroundingTime(new Date());
-		distributionStockListInfoService.save(distributionStockListInfo);
+		distributionStockListInfo.setId(null);
 		distributionUnpackingDetailsService.save(distributionUnpackingDetails);
 		//对原来的库存品进行数据维护
 		one.setQuantityStock(one.getQuantityStock() - distributionStockListDTO.getStoreNum());